Skip to content

Commit cfab63d

Browse files
HHobeckHHobeck
authored
Merge branch 'GitTools:main' into main
2 parents 8a6e973 + 3aa07cc commit cfab63d

File tree

30 files changed

+263
-277
lines changed

30 files changed

+263
-277
lines changed

‎.github/actions/docker-manifests/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
-
3333
name: '[Docker Publish Manifests] DockerHub'
3434
shell: pwsh
35-
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
35+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
3636
-
3737
name: Login to GitHub
3838
uses: docker/login-action@v2
@@ -43,4 +43,4 @@ runs:
4343
-
4444
name: '[Docker Publish Manifests] GitHub'
4545
shell: pwsh
46-
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
46+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/actions/docker-publish/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
-
3636
name: '[Docker Publish] DockerHub'
3737
shell: pwsh
38-
run: dotnet run/docker.dll --target=DockerPublish --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
38+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
3939
-
4040
name: Login to GitHub
4141
uses: docker/login-action@v2
@@ -46,4 +46,4 @@ runs:
4646
-
4747
name: '[Docker Publish] GitHub'
4848
shell: pwsh
49-
run: dotnet run/docker.dll --target=DockerPublish --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
49+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/actions/docker-test/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ runs:
1717
-
1818
name: '[Docker Build & Test] DockerHub'
1919
shell: pwsh
20-
run: dotnet run/docker.dll --target=DockerTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
20+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
2121
-
2222
name: '[Docker Build & Test] GitHub'
2323
shell: pwsh
24-
run: dotnet run/docker.dll --target=DockerTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
24+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/workflows/_artifacts_linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959
-
6060
name: '[Test Artifacts]'
6161
shell: pwsh
62-
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
62+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
6363
env:
6464
TEST_ARM64_ARTIFACTS: ${{ inputs.test_arm64_artifacts }}

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
arch: [ amd64, arm64 ]
65+
arch: [ amd64 ]
6666

6767
uses: ./.github/workflows/_artifacts_linux.yml
6868
with:
@@ -76,7 +76,7 @@ jobs:
7676
strategy:
7777
fail-fast: false
7878
matrix:
79-
arch: [ amd64, arm64 ]
79+
arch: [ amd64 ]
8080

8181
uses: ./.github/workflows/_docker.yml
8282
with:

‎build/.run/Docker Build.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Manifest.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Publish.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Test.run.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/build/Tasks/Package/PackageArchive.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public override void Run(BuildContext context)
1212
{
1313
context.EnsureDirectoryExists(Paths.Native);
1414

15-
var platform = context.Environment.Platform.Family;
15+
var platform = context.Platform;
1616
var runtimes = context.NativeRuntimes[platform];
1717

1818
foreach (var runtime in runtimes)

0 commit comments

Comments
 (0)