From 5d4ebf2d8578157264b37044d60e0e857e53038a Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 15 May 2024 01:33:55 +0900 Subject: [PATCH 1/3] Bump Ubuntu action runner to 24.04 --- .github/workflows/ci-nix.yml | 2 +- .github/workflows/cleanup-staging-packages.yml | 2 +- .github/workflows/containers.yml | 8 ++++---- .github/workflows/dependency-review.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/merge-bot-pr.yml | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-nix.yml b/.github/workflows/ci-nix.yml index 661505b..cde1351 100644 --- a/.github/workflows/ci-nix.yml +++ b/.github/workflows/ci-nix.yml @@ -25,7 +25,7 @@ jobs: fail-fast: false matrix: os: - - ubuntu-latest + - ubuntu-24.04 - macos-14 runs-on: ${{ matrix.os }} timeout-minutes: 30 diff --git a/.github/workflows/cleanup-staging-packages.yml b/.github/workflows/cleanup-staging-packages.yml index 97bcd6a..2022722 100644 --- a/.github/workflows/cleanup-staging-packages.yml +++ b/.github/workflows/cleanup-staging-packages.yml @@ -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: diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 8d6927d..563fd3d 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -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 }} @@ -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 }} @@ -106,7 +106,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 }} @@ -157,7 +157,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 diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 852e36f..4a0d2bf 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -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 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 496fce6..6d95866 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -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 @@ -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" } diff --git a/.github/workflows/merge-bot-pr.yml b/.github/workflows/merge-bot-pr.yml index d40886f..315ee06 100644 --- a/.github/workflows/merge-bot-pr.yml +++ b/.github/workflows/merge-bot-pr.yml @@ -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]' }} @@ -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 @@ -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 From 838d96a27e63fc9cb30e54ec609e42a6f35baf46 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Wed, 15 May 2024 23:44:53 +0900 Subject: [PATCH 2/3] Start debug...! --- .github/workflows/containers.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 3d0c4f3..b75bd19 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -78,6 +78,10 @@ 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 }}' - name: Push To ghcr.io @@ -133,6 +137,10 @@ 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 }}' - name: Push To ghcr.io From 9f4cd41cc906973167fa8cde029462bbb02b44dc Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Thu, 16 May 2024 00:05:20 +0900 Subject: [PATCH 3/3] Specify fullpath when ispections --- .github/workflows/containers.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index b75bd19..b9a8393 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -78,12 +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: 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 }} @@ -137,12 +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: 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 }}