Merge branch 'main' into int128/Add-wait-for-workflows

int128 · web-flow · commit fd7d32c332da · 2026-01-27T09:26:44.000+09:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -23,43 +23,30 @@ on:
       - '*'
 
 jobs:
-  build-latest:
+  build:
     uses: ./.github/workflows/reusable--build.yaml
     permissions:
       contents: read
       packages: write
 
-  build-ubuntu20:
-    uses: ./.github/workflows/reusable--build.yaml
-    permissions:
-      contents: read
-      packages: write
-    with:
-      file: Dockerfile.ubuntu20
-      flavor: suffix=-ubuntu20
-
   e2e-test:
     needs:
-      - build-latest
-      - build-ubuntu20
+      - build
     uses: ./.github/workflows/reusable--e2e-test.yaml
     secrets: inherit
     permissions:
       contents: read
       actions: write
     with:
-      runner-image-uri-latest: ${{ needs.build-latest.outputs.image-uri }}
-      runner-image-uri-ubuntu20: ${{ needs.build-ubuntu20.outputs.image-uri }}
+      runner-image-uri: ${{ needs.build.outputs.image-uri }}
 
   release:
     needs:
-      - build-latest
-      - build-ubuntu20
+      - build
     uses: ./.github/workflows/reusable--release.yaml
     secrets: inherit
     permissions:
       contents: read
       pull-requests: write
     with:
-      runner-image-uri-latest: ${{ needs.build-latest.outputs.image-uri }}
-      runner-image-uri-ubuntu20: ${{ needs.build-ubuntu20.outputs.image-uri }}
+      runner-image-uri: ${{ needs.build.outputs.image-uri }}
diff --git a/.github/workflows/reusable--e2e-test-jobs.yaml b/.github/workflows/reusable--e2e-test-jobs.yaml
@@ -37,15 +37,11 @@ jobs:
           context: e2e-test
           file: e2e-test/fixture.dockerfile
 
-      # setup-ruby does not support ubuntu-20.04
-      - if: inputs.expected-image-os != 'ubuntu20'
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 4.0.1
-      - if: inputs.expected-image-os != 'ubuntu20'
-        run: ruby --version
-      - if: inputs.expected-image-os != 'ubuntu20'
-        run: gem --version
+      - run: ruby --version
+      - run: gem --version
 
       - uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
         with:
diff --git a/.github/workflows/reusable--e2e-test.yaml b/.github/workflows/reusable--e2e-test.yaml
@@ -3,14 +3,10 @@ name: e2e-test
 on:
   workflow_call:
     inputs:
-      runner-image-uri-latest:
+      runner-image-uri:
         type: string
         required: true
-        description: Image URI of runner (latest)
-      runner-image-uri-ubuntu20:
-        type: string
-        required: true
-        description: Image URI of runner (ubuntu20)
+        description: Image URI of runner
       runner-base-name:
         type: string
         description: Base name of runner
@@ -44,26 +40,19 @@ jobs:
 
       - run: make runner-scale-set
         env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
-          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
-      - run: make runner-scale-set
-        env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
-          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu20 }}
+          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}
+          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri }}
 
       # Register a dummy runner scale set to ensure GitHub picks the jobs.
       - run: sleep 60
       - run: make runner-scale-set
         env:
           ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-dummy
-          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
+          ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri }}
 
       - run: make wait-for-runner
         env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
-      - run: make wait-for-runner
-        env:
-          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
+          ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}
       - run: make runner-logs
         if: always()
       - run: make listener-logs
@@ -93,11 +82,5 @@ jobs:
   runner-latest:
     uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
     with:
-      runner-name: ${{ inputs.runner-base-name }}-latest
+      runner-name: ${{ inputs.runner-base-name }}
       expected-image-os: ubuntu24
-
-  runner-ubuntu20:
-    uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
-    with:
-      runner-name: ${{ inputs.runner-base-name }}-ubuntu20
-      expected-image-os: ubuntu20
diff --git a/.github/workflows/reusable--release.yaml b/.github/workflows/reusable--release.yaml
@@ -3,14 +3,10 @@ name: release
 on:
   workflow_call:
     inputs:
-      runner-image-uri-latest:
+      runner-image-uri:
         type: string
         required: true
-        description: Image URI of runner (latest)
-      runner-image-uri-ubuntu20:
-        type: string
-        required: true
-        description: Image URI of runner (ubuntu20)
+        description: Image URI of runner
 
 jobs:
   create-release-if-not-exists:
@@ -22,19 +18,10 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
-      # Ensure the runner versions are the same
-      - id: get-runner-version-latest
+      - id: get-runner-version
         run: bash hack/get-runner-version.sh
         env:
-          RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
-      - id: get-runner-version-ubuntu20
-        run: bash hack/get-runner-version.sh
-        env:
-          RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu20 }}
-      - run: test "$RUNNER_VERSION_LATEST" = "$RUNNER_VERSION_UBUNTU20"
-        env:
-          RUNNER_VERSION_LATEST: ${{ steps.get-runner-version-latest.outputs.runner-version }}
-          RUNNER_VERSION_UBUNTU20: ${{ steps.get-runner-version-ubuntu20.outputs.runner-version }}
+          RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri }}
 
       # When Renovate has updated the runner version,
       # automatically create a new release into GitHub Releases.
@@ -46,7 +33,7 @@ jobs:
       - id: create-release
         run: bash hack/create-release-if-not-exists.sh
         env:
-          RUNNER_VERSION: ${{ steps.get-runner-version-latest.outputs.runner-version }}
+          RUNNER_VERSION: ${{ steps.get-runner-version.outputs.runner-version }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # Trigger the build workflow against the new release
           RELEASE_TOKEN: ${{ steps.release-token.outputs.token }}
diff --git a/Dockerfile.ubuntu20 b/Dockerfile.ubuntu20
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ We extend the official image for the following issues:
 - Run both runner and Dockerd in same container for the resource efficiency of Kubernetes nodes.
   This image starts Dockerd under docker-init.
 - Add some essential packages such as `git`
-- Support Ubuntu 20.04 runner for backward compatibility
+- ~Support Ubuntu 20.04 runner for backward compatibility~
 - ~Run a job on both amd64 and arm64 nodes.
   This repository provides a multi-architectures image.
   ([community#56720](https://github.com/orgs/community/discussions/56720))~ (resolved by [actions/runner#2601](https://github.com/actions/runner/pull/2601))
