Skip to content

Commit

Permalink
Merge pull request #67 from ruby/fix-nightly-job
Browse files Browse the repository at this point in the history
Fix wrong migration result about nightly tag
  • Loading branch information
hsbt authored Feb 2, 2024
2 parents bd7183b + 6cee188 commit ca94e8d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/actions/build_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/actions/push_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down

0 comments on commit ca94e8d

Please sign in to comment.