From ae9ab06d27b245deee6a884751502d7f909270e7 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:02:02 +0900 Subject: [PATCH 01/10] Extract -dev build each images --- .github/workflows/nightly.yml | 93 +++++++++++++++++++++++++++++++---- 1 file changed, 84 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 122a0e4a..bfbbb368 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -30,7 +30,6 @@ jobs: image_version_suffix: '' tag_suffix: '' push_tags: '' - dev_suffix: "-dev" only_development: true optflags: '' cppflags: '' @@ -57,11 +56,36 @@ jobs: ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" + - uses: "./.github/actions/push_image_by_tag" + if: "${{ env.push_tags }}" + with: + push_tags: "${{ env.push_tags }}" + + build_dev_jammy: + + runs-on: ubuntu-latest + + env: + nightly: true + push: true + ubuntu_version: jammy + ruby_version: master + executor: amd64 + image_version_suffix: '' + tag_suffix: '' + push_tags: '' + optflags: '' + cppflags: '' + debugflags: '' + + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/build_image" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" target: development @@ -71,7 +95,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" @@ -93,7 +117,6 @@ jobs: image_version_suffix: '' tag_suffix: '' push_tags: '' - dev_suffix: "-dev" only_development: true optflags: '' cppflags: '' @@ -120,11 +143,37 @@ jobs: ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" + - uses: "./.github/actions/push_image_by_tag" + if: "${{ env.push_tags }}" + with: + push_tags: "${{ env.push_tags }}" + + build_dev_focal: + + runs-on: ubuntu-latest + + env: + nightly: true + push: true + ubuntu_version: focal + ruby_version: master + executor: amd64 + image_version_suffix: '' + tag_suffix: '' + push_tags: '' + only_development: true + optflags: '' + cppflags: '' + debugflags: '' + + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/build_image" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" target: development @@ -134,7 +183,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" @@ -157,7 +206,6 @@ jobs: image_version_suffix: "-debug" tag_suffix: '' push_tags: '' - dev_suffix: "-dev" only_development: true optflags: '' cppflags: '' @@ -184,11 +232,38 @@ jobs: ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" + - uses: "./.github/actions/push_image_by_tag" + if: "${{ env.push_tags }}" + with: + push_tags: "${{ env.push_tags }}" + + build_debug_dev_jammy: + if: "'nightly' == '${{ inputs.ruby_version }}'" + + runs-on: ubuntu-latest + + env: + nightly: true + push: true + ubuntu_version: jammy + ruby_version: master + executor: amd64 + image_version_suffix: "-debug" + tag_suffix: '' + push_tags: '' + only_development: true + optflags: '' + cppflags: '' + debugflags: '' + + steps: + - uses: actions/checkout@v4.1.0 + - uses: "./.github/actions/build_image" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" target: development @@ -198,7 +273,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}-dev" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" From 7f9dd6be1f92d5235efe044fe211fe778ed8f6bb Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:03:16 +0900 Subject: [PATCH 02/10] Don't need to handle only development build. We can always build dev and nomarl builds --- .github/workflows/nightly.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index bfbbb368..66670b5a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -30,7 +30,6 @@ jobs: image_version_suffix: '' tag_suffix: '' push_tags: '' - only_development: true optflags: '' cppflags: '' debugflags: '' @@ -39,7 +38,6 @@ jobs: - uses: actions/checkout@v4.1.0 - uses: "./.github/actions/build_image" - if: "!${{ env.only_development }}" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" @@ -117,7 +115,6 @@ jobs: image_version_suffix: '' tag_suffix: '' push_tags: '' - only_development: true optflags: '' cppflags: '' debugflags: '' @@ -126,7 +123,6 @@ jobs: - uses: actions/checkout@v4.1.0 - uses: "./.github/actions/build_image" - if: "!${{ env.only_development }}" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" @@ -161,7 +157,6 @@ jobs: image_version_suffix: '' tag_suffix: '' push_tags: '' - only_development: true optflags: '' cppflags: '' debugflags: '' @@ -206,7 +201,6 @@ jobs: image_version_suffix: "-debug" tag_suffix: '' push_tags: '' - only_development: true optflags: '' cppflags: '' debugflags: '' @@ -215,7 +209,6 @@ jobs: - uses: actions/checkout@v4.1.0 - uses: "./.github/actions/build_image" - if: "!${{ env.only_development }}" with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" @@ -251,7 +244,6 @@ jobs: image_version_suffix: "-debug" tag_suffix: '' push_tags: '' - only_development: true optflags: '' cppflags: '' debugflags: '' From 5c6a9d7772f52da18cce291a43d264a200a6c41b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:04:03 +0900 Subject: [PATCH 03/10] Removed unused env only for Circle CI --- .github/workflows/nightly.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 66670b5a..31f6a8bf 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -26,7 +26,6 @@ jobs: push: true ubuntu_version: jammy ruby_version: master - executor: amd64 image_version_suffix: '' tag_suffix: '' push_tags: '' @@ -68,7 +67,6 @@ jobs: push: true ubuntu_version: jammy ruby_version: master - executor: amd64 image_version_suffix: '' tag_suffix: '' push_tags: '' @@ -111,7 +109,6 @@ jobs: push: true ubuntu_version: focal ruby_version: master - executor: amd64 image_version_suffix: '' tag_suffix: '' push_tags: '' @@ -153,7 +150,6 @@ jobs: push: true ubuntu_version: focal ruby_version: master - executor: amd64 image_version_suffix: '' tag_suffix: '' push_tags: '' @@ -197,7 +193,6 @@ jobs: push: true ubuntu_version: jammy ruby_version: master - executor: amd64 image_version_suffix: "-debug" tag_suffix: '' push_tags: '' @@ -240,7 +235,6 @@ jobs: push: true ubuntu_version: jammy ruby_version: master - executor: amd64 image_version_suffix: "-debug" tag_suffix: '' push_tags: '' From bef20dcfb4e4ffa30bf5bb1a47ea4e3b85067c91 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:27:56 +0900 Subject: [PATCH 04/10] Use matrix strategy for Ubuntu versions --- .github/workflows/nightly.yml | 113 +++++++--------------------------- 1 file changed, 23 insertions(+), 90 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 31f6a8bf..1bb14535 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -17,97 +17,18 @@ env: GHCR_ACCESS_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }} jobs: - build_jammy: + build: - runs-on: ubuntu-latest - - env: - nightly: true - push: true - ubuntu_version: jammy - ruby_version: master - image_version_suffix: '' - tag_suffix: '' - push_tags: '' - optflags: '' - cppflags: '' - debugflags: '' - - steps: - - uses: actions/checkout@v4.1.0 - - - uses: "./.github/actions/build_image" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image" - if: "${{ env.push }}" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image_by_tag" - if: "${{ env.push_tags }}" - with: - push_tags: "${{ env.push_tags }}" - - build_dev_jammy: + strategy: + matrix: + os: [jammy, focal] runs-on: ubuntu-latest env: nightly: true push: true - ubuntu_version: jammy - ruby_version: master - image_version_suffix: '' - tag_suffix: '' - push_tags: '' - optflags: '' - cppflags: '' - debugflags: '' - - steps: - - uses: actions/checkout@v4.1.0 - - - uses: "./.github/actions/build_image" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - target: development - - - uses: "./.github/actions/push_image" - if: "${{ env.push }}" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image_by_tag" - if: "${{ env.push_tags }}" - with: - push_tags: "${{ env.push_tags }}" - - build_focal: - - runs-on: ubuntu-latest - - env: - nightly: true - push: true - ubuntu_version: focal + ubuntu_version: ${{ matrix.os }} ruby_version: master image_version_suffix: '' tag_suffix: '' @@ -141,14 +62,18 @@ jobs: with: push_tags: "${{ env.push_tags }}" - build_dev_focal: + build_dev: + + strategy: + matrix: + os: [jammy, focal] runs-on: ubuntu-latest env: nightly: true push: true - ubuntu_version: focal + ubuntu_version: ${{ matrix.os }} ruby_version: master image_version_suffix: '' tag_suffix: '' @@ -183,15 +108,19 @@ jobs: with: push_tags: "${{ env.push_tags }}" - build_debug_jammy: + build_debug: if: "'nightly' == '${{ inputs.ruby_version }}'" + strategy: + matrix: + os: [jammy] + runs-on: ubuntu-latest env: nightly: true push: true - ubuntu_version: jammy + ubuntu_version: ${{ matrix.os }} ruby_version: master image_version_suffix: "-debug" tag_suffix: '' @@ -225,15 +154,19 @@ jobs: with: push_tags: "${{ env.push_tags }}" - build_debug_dev_jammy: + build_debug_dev: if: "'nightly' == '${{ inputs.ruby_version }}'" + strategy: + matrix: + os: [jammy] + runs-on: ubuntu-latest env: nightly: true push: true - ubuntu_version: jammy + ubuntu_version: ${{ matrix.os } ruby_version: master image_version_suffix: "-debug" tag_suffix: '' From b55aa99ab77aea4a669a1c35f785c6cf20f48fb0 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:31:45 +0900 Subject: [PATCH 05/10] Remove unnecessary if statements in nightly.yml --- .github/workflows/nightly.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1bb14535..4b02eeed 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -109,8 +109,6 @@ jobs: push_tags: "${{ env.push_tags }}" build_debug: - if: "'nightly' == '${{ inputs.ruby_version }}'" - strategy: matrix: os: [jammy] @@ -155,8 +153,6 @@ jobs: push_tags: "${{ env.push_tags }}" build_debug_dev: - if: "'nightly' == '${{ inputs.ruby_version }}'" - strategy: matrix: os: [jammy] From 1ed734417190a043d9274164d58cde9454c53436 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:41:57 +0900 Subject: [PATCH 06/10] Refactor build matrix with debug option --- .github/workflows/nightly.yml | 96 ++--------------------------------- 1 file changed, 4 insertions(+), 92 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4b02eeed..ccac43e0 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -18,10 +18,10 @@ env: jobs: build: - strategy: matrix: os: [jammy, focal] + debug: ['', '-debug'] runs-on: ubuntu-latest @@ -30,7 +30,7 @@ jobs: push: true ubuntu_version: ${{ matrix.os }} ruby_version: master - image_version_suffix: '' + image_version_suffix: ${{ matrix.debug }} tag_suffix: '' push_tags: '' optflags: '' @@ -67,6 +67,7 @@ jobs: strategy: matrix: os: [jammy, focal] + debug: ['', '-debug'] runs-on: ubuntu-latest @@ -75,96 +76,7 @@ jobs: push: true ubuntu_version: ${{ matrix.os }} ruby_version: master - image_version_suffix: '' - tag_suffix: '' - push_tags: '' - optflags: '' - cppflags: '' - debugflags: '' - - steps: - - uses: actions/checkout@v4.1.0 - - - uses: "./.github/actions/build_image" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - target: development - - - uses: "./.github/actions/push_image" - if: "${{ env.push }}" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image_by_tag" - if: "${{ env.push_tags }}" - with: - push_tags: "${{ env.push_tags }}" - - build_debug: - strategy: - matrix: - os: [jammy] - - runs-on: ubuntu-latest - - env: - nightly: true - push: true - ubuntu_version: ${{ matrix.os }} - ruby_version: master - image_version_suffix: "-debug" - tag_suffix: '' - push_tags: '' - optflags: '' - cppflags: '' - debugflags: '' - - steps: - - uses: actions/checkout@v4.1.0 - - - uses: "./.github/actions/build_image" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image" - if: "${{ env.push }}" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image_by_tag" - if: "${{ env.push_tags }}" - with: - push_tags: "${{ env.push_tags }}" - - build_debug_dev: - strategy: - matrix: - os: [jammy] - - runs-on: ubuntu-latest - - env: - nightly: true - push: true - ubuntu_version: ${{ matrix.os } - ruby_version: master - image_version_suffix: "-debug" + image_version_suffix: "${{ matrix.debug }}" tag_suffix: '' push_tags: '' optflags: '' From f23be011fbf1ce7515a0d2bd58c2c493429c4b40 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:44:15 +0900 Subject: [PATCH 07/10] Add dev option to matrix --- .github/workflows/nightly.yml | 53 +++-------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ccac43e0..5857a87e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,6 +22,7 @@ jobs: matrix: os: [jammy, focal] debug: ['', '-debug'] + dev: ['', '-dev'] runs-on: ubuntu-latest @@ -31,7 +32,7 @@ jobs: ubuntu_version: ${{ matrix.os }} ruby_version: master image_version_suffix: ${{ matrix.debug }} - tag_suffix: '' + tag_suffix: ${{ matrix.dev }} push_tags: '' optflags: '' cppflags: '' @@ -44,53 +45,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image" - if: "${{ env.push }}" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}" - ubuntu_version: "${{ env.ubuntu_version }}" - tag_suffix: "${{ env.tag_suffix }}" - - - uses: "./.github/actions/push_image_by_tag" - if: "${{ env.push_tags }}" - with: - push_tags: "${{ env.push_tags }}" - - build_dev: - - strategy: - matrix: - os: [jammy, focal] - debug: ['', '-debug'] - - runs-on: ubuntu-latest - - env: - nightly: true - push: true - ubuntu_version: ${{ matrix.os }} - ruby_version: master - image_version_suffix: "${{ matrix.debug }}" - tag_suffix: '' - push_tags: '' - optflags: '' - cppflags: '' - debugflags: '' - - steps: - - uses: actions/checkout@v4.1.0 - - - uses: "./.github/actions/build_image" - with: - ruby_version: "${{ env.ruby_version }}" - nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" + image_version_suffix: "${{ env.image_version_suffix }}${{ env.tag_suffix }}" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" target: development @@ -100,7 +55,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}-dev" + image_version_suffix: "${{ env.image_version_suffix }}${{ env.tag_suffix }}" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" From ccb255dbdf2a8f76587e038a351754b5ed618d3a Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:44:33 +0900 Subject: [PATCH 08/10] Remove unused workflow_dispatch input --- .github/workflows/nightly.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5857a87e..f0ccb942 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -4,12 +4,6 @@ on: schedule: - cron: '0 */12 * * *' - workflow_dispatch: - inputs: - ubuntu_version: - required: false - default: jammy - env: DOCKER_USER: ${{ secrets.DOCKER_USER }} DOCKER_PASS: ${{ secrets.DOCKER_PASS }} From 08b5cbfeadf81aeed82d505a1e67d43e12408b41 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 11:54:28 +0900 Subject: [PATCH 09/10] Add conditional logic to set development environment variable --- .github/workflows/nightly.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f0ccb942..56e46f6d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -35,6 +35,13 @@ jobs: steps: - uses: actions/checkout@v4.1.0 + - run: | + if [ ${{ env.tag_suffix }} = "-dev" ]; then + echo "target=development" >> $GITHUB_ENV + else + echo "target=ruby" >> $GITHUB_ENV + fi + - uses: "./.github/actions/build_image" with: ruby_version: "${{ env.ruby_version }}" @@ -42,7 +49,7 @@ jobs: image_version_suffix: "${{ env.image_version_suffix }}${{ env.tag_suffix }}" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" - target: development + target: ${{ env.target }} - uses: "./.github/actions/push_image" if: "${{ env.push }}" From 0c206a5c5cccb96be557cdd20ffc8907316b480d Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 2 Feb 2024 13:10:44 +0900 Subject: [PATCH 10/10] Use dev_suffix instead of tag_suffix --- .github/workflows/nightly.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 56e46f6d..18935ca7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -26,8 +26,9 @@ jobs: ubuntu_version: ${{ matrix.os }} ruby_version: master image_version_suffix: ${{ matrix.debug }} - tag_suffix: ${{ matrix.dev }} + tag_suffix: '' push_tags: '' + dev_suffix: ${{ matrix.dev }} optflags: '' cppflags: '' debugflags: '' @@ -46,7 +47,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.tag_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}" target: ${{ env.target }} @@ -56,7 +57,7 @@ jobs: with: ruby_version: "${{ env.ruby_version }}" nightly: "${{ env.nightly }}" - image_version_suffix: "${{ env.image_version_suffix }}${{ env.tag_suffix }}" + image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}" ubuntu_version: "${{ env.ubuntu_version }}" tag_suffix: "${{ env.tag_suffix }}"