diff --git a/.github/workflows/scripts/get-image-tags.rb b/.github/workflows/scripts/get-image-tags.rb index bdcb230..0bf30cc 100755 --- a/.github/workflows/scripts/get-image-tags.rb +++ b/.github/workflows/scripts/get-image-tags.rb @@ -18,7 +18,7 @@ def main git_ref_name: git_ref_name, git_ref_type: git_ref_type, git_default_branch: git_default_branch, - package: JSON.parse(File.read('package.json')), + semver: '0.0.0', ).to_a.join(',') # log to stderr so that stdout only contains the full tags diff --git a/.github/workflows/scripts/lib.rb b/.github/workflows/scripts/lib.rb index d8d0353..462ea24 100644 --- a/.github/workflows/scripts/lib.rb +++ b/.github/workflows/scripts/lib.rb @@ -10,7 +10,7 @@ def get_image_tags( git_ref_name: nil, git_ref_type: nil, git_default_branch: nil, - package: nil + semver: nil ) container_repo = "ghcr.io/#{git_repo.downcase}" versions = Set[] @@ -20,9 +20,9 @@ def get_image_tags( versions.add(git_ref_name.downcase.gsub(/[^a-z0-9._\n]+/, '-')) elsif git_ref_type == 'tag' # add version tag - versions.add(package['version']) + versions.add(semver) # TODO: check that this is actually latest - parsed = parse_semver(package['version']) + parsed = parse_semver(semver) if parsed.pre == nil versions.add(parsed.major) versions.add("#{parsed.major}.#{parsed.minor}") diff --git a/.github/workflows/scripts/test/get-image-tags.unit.rb b/.github/workflows/scripts/test/get-image-tags.unit.rb index 32e69b9..6490d84 100755 --- a/.github/workflows/scripts/test/get-image-tags.unit.rb +++ b/.github/workflows/scripts/test/get-image-tags.unit.rb @@ -13,7 +13,7 @@ class TestGetImageTags < Test::Unit::TestCase git_ref_name: 'feat/foo-bar', git_ref_type: 'branch', git_default_branch: 'master', - package: JSON.parse('{"version": "1.0.0"}'), + semver: '1.0.0', ), ) @@ -27,7 +27,7 @@ class TestGetImageTags < Test::Unit::TestCase git_ref_name: 'master', git_ref_type: 'branch', git_default_branch: 'master', - package: JSON.parse('{"version": "1.0.0"}'), + semver: '1.0.0', ), ) end @@ -46,7 +46,7 @@ class TestGetImageTags < Test::Unit::TestCase git_ref_name: '1.0.0', git_ref_type: 'tag', git_default_branch: 'master', - package: JSON.parse('{"version": "1.0.0"}'), + semver: '1.0.0', ), ) end @@ -63,7 +63,7 @@ class TestGetImageTags < Test::Unit::TestCase git_ref_name: '1.0.0', git_ref_type: 'tag', git_default_branch: 'master', - package: JSON.parse('{"version": "1.0.0-pre"}'), + semver: '1.0.0-pre', ), ) end @@ -76,7 +76,7 @@ class TestGetImageTags < Test::Unit::TestCase git_ref_name: 'feat/Foo---bar', git_ref_type: 'branch', git_default_branch: 'master', - package: JSON.parse('{"version": "1.0.0"}'), + semver: '1.0.0', ), ) end