Merge pull request #67 from ruby/fix-nightly-job

Fix wrong migration result about nightly tag

Author: hsbt

.github/actions/build_image/action.yml

@@ -39,11 +39,11 @@ runs:
                         ubuntu_version=${{ inputs.ubuntu_version }} \
                         arch=${{ inputs.arch }} \
                         image_version_suffix=${{ inputs.image_version_suffix }} \
-                        ${{ inputs.nightly }}nightly=yes${{ inputs.nightly }} \
+                        nightly=${{ inputs.nightly }} \
                         tag_suffix=${{ inputs.tag_suffix }} \
                         target=${{ inputs.target }} \
                         latest_tag=${{ inputs.latest_tag }}
     shell: bash
   - name: List images
     run: docker images
-    shell: bash
+    shell: bash

.github/actions/push_image/action.yml

@@ -27,7 +27,7 @@ runs:
       rake docker:push ruby_version=${{ inputs.ruby_version }} \
                        ubuntu_version=${{ inputs.ubuntu_version }} \
                        image_version_suffix=${{ inputs.image_version_suffix }} \
-                       ${{ inputs.nightly }}nightly=yes${{ inputs.nightly }} \
+                       nightly=${{ inputs.nightly }} \
                        tag_suffix=${{ inputs.tag_suffix }} \
                        latest_tag=${{ inputs.latest_tag }}
-    shell: bash
+    shell: bash

Rakefile

@@ -170,7 +170,7 @@ namespace :docker do
   end
 
   def each_nightly_tag(ruby_version, tags)
-    return [] unless ENV.key?('nightly') && ruby_version.start_with?('master:')
+    return [] unless (ENV('nightly') == 'true') && ruby_version.start_with?('master:')
     commit_hash = ruby_version.split(":")[1]
     commit_hash_re = /\b#{Regexp.escape(commit_hash)}\b/
     image_name = tags.find {|x| x.match? commit_hash_re }