Skip to content

Commit

Permalink
Update CI/workflow runners to Ubuntu 24.04 (#745)
Browse files Browse the repository at this point in the history
* Update CI/workflow runners to Ubuntu 24.04

See also:
actions/runner-images#9848
https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
https://salesforce.quip.com/bu6UA0KImOxJ#temp:C:GZRd13d2ce2d455470495cbd34cf

* pip install in a venv for Ubuntu 24.04

* use pub-hk-ubuntu-24.04-arm-small instead of pub-hk-ubuntu-24.04-arm-ip
  • Loading branch information
dzuelke authored and robinwo committed Sep 13, 2024
1 parent 49ecfd0 commit f221d00
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

jobs:
hatchet-app-cleaner:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
HATCHET_APP_PREFIX: "htcht-"
HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:

jobs:
integration-test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
matrix:
stack: ["heroku-20", "heroku-22", "heroku-24"]
Expand All @@ -52,11 +52,14 @@ jobs:
tools: "composer:2.7"
- name: Install packages from requirements.txt, plus s5cmd (for some tests)
run: |
export VIRTUAL_ENV=$HOME/.venv
python3 -m venv "$VIRTUAL_ENV"
export PATH=$VIRTUAL_ENV/bin:$PATH
pip install -r requirements.txt
curl -sSLO https://github.com/peak/s5cmd/releases/download/v${S5CMD_VERSION}/s5cmd_${S5CMD_VERSION}_linux_amd64.deb
echo "$S5CMD_HASH" | shasum -c -
dpkg -x "s5cmd_${S5CMD_VERSION}_linux_amd64.deb" .
echo "$HOME/usr/bin" >> "$GITHUB_PATH"
echo "$HOME/usr/bin:$VIRTUAL_ENV/bin" >> "$GITHUB_PATH"
- name: Hatchet setup
run: bundle exec hatchet ci:setup
- name: Export HEROKU_PHP_PLATFORM_REPOSITORIES to …${{env.src_path_suffix}} (since we are not building main or a tag)
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/platform-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ permissions:

jobs:
formulae-list:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
formulae: ${{ steps.expand-formulae.outputs.matrix }}
steps:
Expand All @@ -62,7 +62,7 @@ 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-small' || 'ubuntu-22.04' }}
runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -85,7 +85,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-xlarge' || 'pub-hk-ubuntu-22.04-xlarge' }}
runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-xlarge' || 'pub-hk-ubuntu-24.04-xlarge' }}
strategy:
max-parallel: ${{ fromJSON(inputs.concurrency) }}
matrix:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
mkrepo:
needs: [deploys]
if: ${{ inputs.dry-run == false }}
runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
runs-on: ${{ endsWith(inputs.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/platform-remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ permissions:

jobs:
remove:
runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
runs-on: ${{ endsWith(inputs.stack, 'arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/platform-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ permissions:

jobs:
stack-list:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
stacks: ${{ steps.list-stacks.outputs.matrix }}
steps:
Expand All @@ -61,7 +61,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-small' || 'ubuntu-22.04' }}
runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
strategy:
matrix:
stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }}
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
strategy:
matrix:
stack: ${{ fromJSON(needs.stack-list.outputs.stacks) }}
runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-22.04-arm-small' || 'ubuntu-22.04' }}
runs-on: ${{ endsWith(matrix.stack, '-arm64') && 'pub-hk-ubuntu-24.04-arm-small' || 'ubuntu-24.04' }}
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
echo '```' >> "$GITHUB_STEP_SUMMARY"
devcenter-generate:
needs: sync
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
diff_result: ${{ steps.diff.outputs.diff_result }}
steps:
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
devcenter-update:
needs: devcenter-generate
if: ${{ needs.devcenter-generate.outputs.diff_result == 1 }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
HEROKU_DEVCENTER_API_TOKEN: ${{ secrets.HEROKU_DEVCENTER_API_TOKEN }}
steps:
Expand Down Expand Up @@ -326,7 +326,7 @@ jobs:
echo 'Successfully updated ["PHP Support" Dev Center article](https://devcenter.heroku.com/articles/php-support) with synced packages.' >> "$GITHUB_STEP_SUMMARY"
changelog-generate:
needs: sync
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down

0 comments on commit f221d00

Please sign in to comment.