From 19340a067d7b33005fd99eb9756180f778ef35ed Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:14:59 +0200 Subject: [PATCH 1/2] switch to new runners --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a19cf9c..0905a3f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: build_rpms: name: Build ${{ matrix.base_image }} ${{ matrix.target_arch }} - runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }} needs: - configure strategy: @@ -70,7 +70,7 @@ jobs: test_rpms: name: Test ${{ matrix.base_image }} ${{ matrix.target_arch }} - runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }} needs: - configure - build_rpms @@ -157,7 +157,7 @@ jobs: build_deb: name: Build ${{ matrix.base_image }} ${{ matrix.target_arch }} - runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }} needs: - configure strategy: @@ -200,7 +200,7 @@ jobs: test_deb: name: Test ${{ matrix.base_image }} ${{ matrix.target_arch }} - runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64' || 'ubuntu-latest' }} + runs-on: ${{ matrix.target_arch == 'aarch64' && 'ubuntu-latest-arm64-small' || 'ubuntu-latest' }} needs: - configure - build_deb From 275a7c1b2e9558d2411e58a05236571f4a1c3eb2 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo <71768+gionn@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:20:27 +0200 Subject: [PATCH 2/2] drop setup-docker action --- .github/workflows/build.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0905a3f..21f009c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,10 +45,6 @@ jobs: echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT - - name: Setup Docker Engine - if: matrix.target_arch == 'aarch64' - uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0 - - name: Prepare image run: docker build . -t buildenv --build-arg BASE_IMAGE=${{ matrix.base_image }} working-directory: rpms @@ -97,10 +93,6 @@ jobs: - name: List RPMs run: ls -R rpms/tests/*.rpm - - name: Setup Docker Engine - if: matrix.target_arch == 'aarch64' - uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@9558268b491821a4cfce1f11d4c8f6e56adc8496 # v5.30.0 - - name: Prepare image run: docker build . -t testenv --build-arg BASE_IMAGE=${{ matrix.base_image }} working-directory: rpms/tests/ @@ -174,10 +166,6 @@ jobs: echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT - - name: Setup Docker Engine - if: matrix.target_arch == 'aarch64' - uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@a288b9efdaa50413573b2e130896d906478b8e50 # v5.31.0 - - name: Prepare image run: docker build . -t buildenv --build-arg BASE_IMAGE=${{ matrix.base_image }} working-directory: debs @@ -221,10 +209,6 @@ jobs: echo "imagemagick_version=$(cat ./imagemagick-version)" >> $GITHUB_OUTPUT echo "imagemagick_release=$(cat ./release-version)" >> $GITHUB_OUTPUT - - name: Setup Docker Engine - if: matrix.target_arch == 'aarch64' - uses: Alfresco/alfresco-build-tools/.github/actions/setup-docker@a288b9efdaa50413573b2e130896d906478b8e50 # v5.31.0 - - name: Download DEBs uses: actions/download-artifact@v4 with: