From 13f28e4d56bdd8d05ffc7e43e8e1fe08e4a47ecc Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 7 Feb 2024 11:08:26 +0900 Subject: [PATCH] Use matrix build for manifest --- .github/workflows/build_multiarch.yml | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_multiarch.yml b/.github/workflows/build_multiarch.yml index 800d37b..ee68272 100644 --- a/.github/workflows/build_multiarch.yml +++ b/.github/workflows/build_multiarch.yml @@ -116,6 +116,11 @@ jobs: strategy: matrix: registry_name: [ rubylang, ghcr.io/ruby ] + include: + - latest_tag: true + image_version_suffix: '' + - latest_tag: false + image_version_suffix: '-dev' runs-on: ubuntu-latest @@ -147,14 +152,8 @@ jobs: ubuntu_version="${{ env.ubuntu_version }}" \ architectures="amd64 arm64" \ manifest_suffix=${{ github.sha }} \ - latest_tag=true - rake docker:manifest:create \ - registry_name="${{ matrix.registry_name }}" \ - ruby_version="${{ env.ruby_version }}" \ - ubuntu_version="${{ env.ubuntu_version }}" \ - architectures="amd64 arm64" \ - image_version_suffix=-dev \ - manifest_suffix=${{ github.sha }} + latest_tag=${{ matrix.latest_tag }} \ + image_version_suffix=${{ matrix.image_version_suffix }} - name: Push manifest to ${{ matrix.registry_name }} run: |- @@ -162,9 +161,5 @@ jobs: registry_name="${{ matrix.registry_name }}" \ ruby_version="${{ env.ruby_version }}" \ ubuntu_version="${{ env.ubuntu_version }}" \ - latest_tag=true - rake docker:manifest:push \ - registry_name="${{ matrix.registry_name }}" \ - ruby_version="${{ env.ruby_version }}" \ - ubuntu_version="${{ env.ubuntu_version }}" \ - image_version_suffix=-dev + latest_tag=${{ matrix.latest_tag }} \ + image_version_suffix=${{ matrix.image_version_suffix }}