diff --git a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml index 7d3c187..f1889a0 100644 --- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml @@ -9,6 +9,7 @@ on: jobs: daily_unit_tests_with_nightly_puppet_gem: uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml@main" + secrets: inherit notify-via-slack: name: Notify workflow conclusion via Slack diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 81a0f34..52df062 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -11,6 +11,8 @@ on: jobs: Nightly: uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml@main" + secrets: inherit Released: uses: "puppetlabs/phoenix-github-actions/.github/workflows/unit_tests_with_released_puppet_gem.yaml@main" + secrets: inherit diff --git a/Gemfile b/Gemfile index 4989465..ec739c5 100644 --- a/Gemfile +++ b/Gemfile @@ -3,11 +3,14 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' def location_for(place_or_version, fake_version = nil) git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} file_url_regex = %r{\Afile:\/\/(?.*)} + source_url_regex = %r{\Asource:(?[^#]*)(#(?.*))?} if place_or_version && (git_url = place_or_version.match(git_url_regex)) [fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact elsif place_or_version && (file_url = place_or_version.match(file_url_regex)) ['>= 0', { path: File.expand_path(file_url[:path]), require: false }] + elsif place_or_version && (source = place_or_version.match(source_url_regex)) + [source[:version], { require: false, source: source[:url] }] else [place_or_version, { require: false }] end