Skip to content

Commit

Permalink
Bump Ubuntu action runner to 24.04 (#73)
Browse files Browse the repository at this point in the history
* Bump Ubuntu action runner to 24.04

* Start debug...!

* Specify fullpath when ispections
  • Loading branch information
kachick authored May 15, 2024
1 parent bab8fa0 commit fe805e0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
os:
- ubuntu-latest
- ubuntu-24.04
- macos-14
runs-on: ${{ matrix.os }}
timeout-minutes: 30
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup-staging-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defaults:

jobs:
ghcr:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: (github.event_name != 'pull_request') || (github.event.pull_request.merged == true)
timeout-minutes: 15
steps:
Expand Down
22 changes: 16 additions & 6 deletions .github/workflows/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
# podman can handle lowercase. So normalize the outputs
get-meta:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
started_at: ${{ steps.timestamp.outputs.started_at }}
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
echo "ref=${ref}" | tee -a "$GITHUB_OUTPUT"
ubuntu-nix-sudoer:
needs: [get-meta]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 30
outputs:
package-json: ${{ steps.inspect-package.outputs.json }}
Expand All @@ -78,8 +78,13 @@ jobs:
build-args: |
username=user
oci: true
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# with:
# limit-access-to-actor: true
- name: Inspect the created image
run: 'podman inspect ${{ steps.build-image.outputs.image }}'
run: |
podman inspect localhost/${{ steps.build-image.outputs.image }}:${{ needs.get-meta.outputs.ref_tag }}
- name: Push To ghcr.io
id: push-to-ghcr
if: ${{ github.actor == github.repository_owner }}
Expand Down Expand Up @@ -111,7 +116,7 @@ jobs:
jq | gh-action-escape -name=json | tee -a "$GITHUB_OUTPUT"
ubuntu-nix-systemd:
needs: [get-meta]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 30
outputs:
package-json: ${{ steps.inspect-package.outputs.json }}
Expand All @@ -133,8 +138,13 @@ jobs:
containerfiles: |
./images/ubuntu-nix-systemd/Containerfile
oci: true
# - name: Setup tmate session
# uses: mxschmitt/action-tmate@v3
# with:
# limit-access-to-actor: true
- name: Inspect the created image
run: 'podman inspect ${{ steps.build-image.outputs.image }}'
run: |
podman inspect localhost/${{ steps.build-image.outputs.image }}:${{ needs.get-meta.outputs.ref_tag }}
- name: Push To ghcr.io
id: push-to-ghcr
if: ${{ github.actor == github.repository_owner }}
Expand Down Expand Up @@ -167,7 +177,7 @@ jobs:
announce-staging:
needs: [get-meta, ubuntu-nix-systemd, ubuntu-nix-sudoer]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 10
steps:
- name: Prepare git to run gh commands
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
dependency-review:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
dprint:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: dprint/check@v2.2
Expand All @@ -16,7 +16,7 @@ jobs:

typos:
timeout-minutes: 15
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: crate-ci/typos@v1.21.0 # selfup { "regex": "\\d\\.\\d+\\.\\d+", "script": "typos --version | cut -d ' ' -f 2" }
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/merge-bot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:
jobs:
judge-dependabot:
timeout-minutes: 5
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
merge: ${{ steps.conclusion.outputs.merge }}
if: ${{ github.actor == 'dependabot[bot]' }}
Expand All @@ -28,7 +28,7 @@ jobs:
needs: [judge-dependabot]
if: ${{ needs.judge-dependabot.outputs.merge == 'true' }}
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Wait other jobs
uses: kachick/wait-other-jobs@v3
Expand All @@ -43,7 +43,7 @@ jobs:

selfup-runner:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor == 'selfup-runner[bot]' }}
steps:
- name: Wait other jobs
Expand Down

0 comments on commit fe805e0

Please sign in to comment.