From 20d4b44cfe1ab9a4e1c0ca4dd9b1f9dc16e3e893 Mon Sep 17 00:00:00 2001 From: David Zuelke Date: Thu, 30 May 2024 03:08:36 +0200 Subject: [PATCH] Try new Arm Ltd images for GHA runners No more Docker install needed: https://github.com/github-early-access/arm-runners-beta/discussions/34 --- .github/workflows/platform-build.yml | 30 +++------------------------ .github/workflows/platform-remove.yml | 10 +-------- .github/workflows/platform-sync.yml | 20 ++---------------- 3 files changed, 6 insertions(+), 54 deletions(-) diff --git a/.github/workflows/platform-build.yml b/.github/workflows/platform-build.yml index 8e3964f17..2e9a72054 100644 --- a/.github/workflows/platform-build.yml +++ b/.github/workflows/platform-build.yml @@ -64,18 +64,10 @@ jobs: ls -f ${{inputs.formulae}} | xargs -n 1 echo - >> "$GITHUB_STEP_SUMMARY" ls -f ${{inputs.formulae}} | jq -jcRn '[inputs|select(length>0)]' >> "$GITHUB_OUTPUT" docker-build: - runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'ubuntu-22.04' }} + runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'ubuntu-22.04' }} steps: - name: Checkout uses: actions/checkout@v4 - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(inputs.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Cache Docker build id: cache-docker uses: actions/cache@v4 @@ -95,7 +87,7 @@ jobs: deploys: needs: [formulae-list, docker-build] if: ${{ needs.formulae-list.outputs.formulae != '[]' && needs.formulae-list.outputs.formulae != '' }} - runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'pub-hk-ubuntu-22.04-large' }} + runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'pub-hk-ubuntu-22.04-large' }} strategy: max-parallel: ${{ fromJSON(inputs.concurrency) }} matrix: @@ -111,14 +103,6 @@ jobs: with: key: docker-cache-heroku-php-build-${{inputs.stack}}.${{github.sha}} path: /tmp/docker-cache.tar.gz - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(inputs.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Load cached Docker image run: docker load -i /tmp/docker-cache.tar.gz - name: Build formula without deploying @@ -133,7 +117,7 @@ jobs: mkrepo: needs: [deploys] if: ${{ inputs.dry-run == false && inputs.publish == true }} - runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'ubuntu-22.04' }} + runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'ubuntu-22.04' }} env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -145,14 +129,6 @@ jobs: with: key: docker-cache-heroku-php-build-${{inputs.stack}}.${{github.sha}} path: /tmp/docker-cache.tar.gz - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(inputs.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Load cached Docker image run: docker load -i /tmp/docker-cache.tar.gz - name: Re-generate platform package repository diff --git a/.github/workflows/platform-remove.yml b/.github/workflows/platform-remove.yml index 864aa906b..c5d7a6cfb 100644 --- a/.github/workflows/platform-remove.yml +++ b/.github/workflows/platform-remove.yml @@ -28,7 +28,7 @@ permissions: jobs: remove: - runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'ubuntu-22.04' }} + runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'ubuntu-22.04' }} env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -46,14 +46,6 @@ jobs: with: key: docker-cache-heroku-php-build-${{inputs.stack}}.${{github.sha}} path: /tmp/docker-cache.tar.gz - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(inputs.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Load cached Docker image if: steps.restore-docker.outputs.cache-hit == 'true' run: docker load -i /tmp/docker-cache.tar.gz diff --git a/.github/workflows/platform-sync.yml b/.github/workflows/platform-sync.yml index 924ced990..5a387716e 100644 --- a/.github/workflows/platform-sync.yml +++ b/.github/workflows/platform-sync.yml @@ -54,7 +54,7 @@ jobs: docker-build: needs: stack-list if: ${{ needs.stack-list.outputs.stacks != '[]' && needs.stack-list.outputs.stacks != '' }} - runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'ubuntu-22.04' }} + runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'ubuntu-22.04' }} strategy: matrix: stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }} @@ -67,14 +67,6 @@ jobs: with: key: docker-cache-heroku-php-build-${{matrix.stack}}.${{github.sha}} path: /tmp/docker-cache.tar.gz - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(matrix.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Load cached Docker image if: steps.restore-docker.outputs.cache-hit == 'true' run: docker load -i /tmp/docker-cache.tar.gz @@ -99,7 +91,7 @@ jobs: strategy: matrix: stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }} - runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-large' || 'ubuntu-22.04' }} + runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-limited-large' || 'ubuntu-22.04' }} env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} @@ -111,14 +103,6 @@ jobs: with: key: docker-cache-heroku-php-build-${{matrix.stack}}.${{github.sha}} path: /tmp/docker-cache.tar.gz - # The beta ARM64 runners don't yet ship with the normal installed tools. - - name: Install Docker (ARM64 only) - if: endsWith(matrix.stack, '-arm64') - run: | - sudo apt-get update --error-on=any - sudo apt-get install -y --no-install-recommends acl docker.io docker-buildx - sudo usermod -aG docker $USER - sudo setfacl --modify user:$USER:rw /var/run/docker.sock - name: Load cached Docker image run: docker load -i /tmp/docker-cache.tar.gz - name: ${{ inputs.dry-run == true && 'Dry-run sync of' || 'Sync' }} changed packages to production bucket