build using [ubuntu-24.04, ubuntu-24.04-arm]

arturcic · Jan 18, 2025 · dac0e66 · dac0e66
1 parent 56391ef
commit dac0e66
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/.github/workflows/build-deps.yml b/.github/workflows/build-deps.yml
@@ -40,14 +40,21 @@ jobs:
                 run: dotnet run/build.dll --target=SetMatrix
 
     build_deps:
-        name: Deps
+        name: Deps (${{ matrix.arch }} - ${{ matrix.distro }})
         needs: [ prepare ]
         env:
             PUSH_IMAGES: ${{github.event_name != 'pull_request' && github.repository_owner == 'GitTools'}}
-        runs-on: ubuntu-24.04
+        runs-on: ${{ matrix.runner }}
         strategy:
             matrix:
+                arch: [amd64, arm64]
+                runner: [ubuntu-24.04, ubuntu-24.04-arm]
                 distro: ${{ fromJson(needs.prepare.outputs.dockerDistros) }}
+                exclude:
+                    -   runner: ubuntu-24.04-arm
+                        arch: amd64
+                    -   runner: ubuntu-24.04
+                        arch: arm64
             fail-fast: false
         steps:
             -   name: Checkout
@@ -62,18 +69,6 @@ jobs:
                 uses: actions/setup-dotnet@v4
                 with:
                     global-json-file: build/global.json
-            -   name: Set up Docker
-                uses: docker/setup-docker-action@v4
-                with:
-                    daemon-config: '{ "features": { "containerd-snapshotter": true } }'
-            -   name: Setup QEMU
-                uses: docker/setup-qemu-action@v3
-            -   name: Setup Docker Buildx
-                uses: docker/setup-buildx-action@v3
-                with:
-                    version: 'latest'
-                    driver-opts: 'image=moby/buildkit:buildx-stable-1'
-                    install: true
             -   name: Login to DockerHub
                 if: success() && env.PUSH_IMAGES == 'true'
                 uses: docker/login-action@v3
@@ -83,8 +78,11 @@ jobs:
 
             -   name: '[Build Docker images]'
                 shell: pwsh
-                run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
-                    --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
+                run: |
+                    dotnet run/build.dll `
+                            --target=DockerBuildDeps --arch=${{ matrix.arch }} `
+                            --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
+                            --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
 
             -   name: Login to GitHub Container Registry
                 if: success() && env.PUSH_IMAGES == 'true'
@@ -95,5 +93,8 @@ jobs:
                     password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
             -   name: '[Build Docker images]'
                 shell: pwsh
-                run: dotnet run/build.dll --target=DockerBuildDeps --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
-                    --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
+                run: |
+                    dotnet run/build.dll `
+                            --target=DockerBuildDeps --arch=${{ matrix.arch }} `
+                            --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
+                            --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,16 +36,23 @@ jobs:
                 run: dotnet run/build.dll --target=SetMatrix
 
     build:
-        name: Build
+        name: Build (${{ matrix.arch }} - ${{ matrix.distro }}) (${{ matrix.version }} - ${{ matrix.variant }})
         needs: [ prepare ]
         env:
             PUSH_IMAGES: ${{github.event_name != 'pull_request' && github.repository_owner == 'GitTools'}}
-        runs-on: ubuntu-24.04
+        runs-on: ${{ matrix.runner }}
         strategy:
             matrix:
+                arch: [ amd64, arm64 ]
+                runner: [ ubuntu-24.04, ubuntu-24.04-arm ]
                 distro:  ${{ fromJson(needs.prepare.outputs.dockerDistros) }}
                 version: ${{ fromJson(needs.prepare.outputs.dotnetVersions) }}
                 variant: ${{ fromJson(needs.prepare.outputs.dotnetVariants) }}
+                exclude:
+                    -   runner: ubuntu-24.04-arm
+                        arch: amd64
+                    -   runner: ubuntu-24.04
+                        arch: arm64
             fail-fast: false
 
         steps:
@@ -61,18 +68,6 @@ jobs:
                 uses: actions/setup-dotnet@v4
                 with:
                     global-json-file: build/global.json
-            -   name: Set up Docker
-                uses: docker/setup-docker-action@v4
-                with:
-                    daemon-config: '{ "features": { "containerd-snapshotter": true } }'
-            -   name: Setup QEMU
-                uses: docker/setup-qemu-action@v3
-            -   name: Setup Docker Buildx
-                uses: docker/setup-buildx-action@v3
-                with:
-                    version: 'latest'
-                    driver-opts: 'image=moby/buildkit:buildx-stable-1'
-                    install: true
             -   name: Login to DockerHub
                 if: success() && env.PUSH_IMAGES == 'true'
                 uses: docker/login-action@v3
@@ -82,9 +77,11 @@ jobs:
             -   name: '[Build Docker images]'
                 shell: pwsh
                 run: |
-                    dotnet run/build.dll --target=DockerBuild --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                                         --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
-                                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
+                    dotnet run/build.dll `
+                        --target=DockerBuild --arch=${{ matrix.arch }} `
+                        --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
+                        --dotnet_distro=${{ matrix.distro }} --docker_registry=dockerhub `
+                        --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
             -   name: Login to GitHub Container Registry
                 if: success() && env.PUSH_IMAGES == 'true'
                 uses: docker/login-action@v3
@@ -95,6 +92,8 @@ jobs:
             -   name: '[Build Docker images]'
                 shell: pwsh
                 run: |
-                    dotnet run/build.dll --target=DockerBuild --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
-                                         --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
-                                         --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic
+                    dotnet run/build.dll `
+                        --target=DockerBuild --arch=${{ matrix.arch }} `
+                        --dotnet_version=${{ matrix.version }} --dotnet_variant=${{ matrix.variant }} `
+                        --dotnet_distro=${{ matrix.distro }} --docker_registry=github `
+                        --push_images=${{env.PUSH_IMAGES}} --verbosity=diagnostic