From 82d5c7bdab07b81109061147f5bf02465d0bdddb Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Tue, 1 Nov 2022 08:06:44 -0400 Subject: [PATCH] Update source of `gimme` --- lib/travis/build/config.rb | 2 +- lib/travis/build/rake_tasks.rb | 4 ++-- lib/travis/build/script/go.rb | 2 +- spec/build/bash/travis_prepare_go_spec.rb | 6 +++--- spec/build/rake_tasks_spec.rb | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/travis/build/config.rb b/lib/travis/build/config.rb index 8670cb2466..bf11c06795 100644 --- a/lib/travis/build/config.rb +++ b/lib/travis/build/config.rb @@ -86,7 +86,7 @@ def sc_data gimme: { url: ENV.fetch( 'TRAVIS_BUILD_GIMME_URL', - 'https://raw.githubusercontent.com/travis-ci/gimme/v1.5.3/gimme' + 'https://raw.githubusercontent.com/urfave/gimme/v1.7.0/gimme' ) }, go_version: ENV.fetch('TRAVIS_BUILD_GO_VERSION', '1.11.x'), diff --git a/lib/travis/build/rake_tasks.rb b/lib/travis/build/rake_tasks.rb index c1fbc1c07f..0df821a38e 100644 --- a/lib/travis/build/rake_tasks.rb +++ b/lib/travis/build/rake_tasks.rb @@ -237,9 +237,9 @@ def file_update_casher end def file_update_gimme - latest_release = latest_release_for('travis-ci/gimme') + latest_release = latest_release_for('urfave/gimme') logger.info "Latest gimme release is #{latest_release}" - fetch_githubusercontent_file "travis-ci/gimme/#{latest_release}/gimme" + fetch_githubusercontent_file "urfave/gimme/#{latest_release}/gimme" end def file_update_godep_for_darwin diff --git a/lib/travis/build/script/go.rb b/lib/travis/build/script/go.rb index 196c9a6855..cce2af9275 100644 --- a/lib/travis/build/script/go.rb +++ b/lib/travis/build/script/go.rb @@ -77,7 +77,7 @@ def cache_slug private def gimme_url cleaned = URI.parse(gimme_config[:url]).to_s.output_safe - return cleaned if cleaned =~ %r{^https://raw\.githubusercontent\.com/travis-ci/gimme} + return cleaned if cleaned =~ %r{^https://raw\.githubusercontent\.com/urfave/gimme} DEFAULTS[:gimme_config][:url] rescue URI::InvalidURIError => e warn e diff --git a/spec/build/bash/travis_prepare_go_spec.rb b/spec/build/bash/travis_prepare_go_spec.rb index 0023bbce32..cf0e80d240 100644 --- a/spec/build/bash/travis_prepare_go_spec.rb +++ b/spec/build/bash/travis_prepare_go_spec.rb @@ -72,13 +72,13 @@ expect(result[:out].read).to include('no ~/.gvm yay') end - context 'when gimme>=1.5.3 is already installed' do + context 'when gimme>=1.7.0 is already installed' do it 'bootstraps the default go and warms the known version cache' do result = run_script( 'travis_prepare_go', <<~BASH #{script_header} - GIMME_VERSION=v1.5.3 + GIMME_VERSION=v1.7.0 apk add --no-cache curl grep travis_prepare_go "${GIMME_URL}" "1.7.6" @@ -93,7 +93,7 @@ end end - context 'when gimme<1.5.3 is already installed' do + context 'when gimme<1.7.0 is already installed' do it 'updates gimme, bootstraps the default go, and warms the known version cache' do result = run_script( 'travis_prepare_go', diff --git a/spec/build/rake_tasks_spec.rb b/spec/build/rake_tasks_spec.rb index 1bbbf0bad6..e4ffe07f34 100644 --- a/spec/build/rake_tasks_spec.rb +++ b/spec/build/rake_tasks_spec.rb @@ -27,7 +27,7 @@ def releases_response(*versions) creationix/nvm tmate-io/tmate tools/godep - travis-ci/gimme + urfave/gimme ].each do |repo_slug| stub.get("/repos/#{repo_slug}/releases") do |*| releases_response('v1.2.3', 'v1.2.5') @@ -52,14 +52,14 @@ def releases_response(*versions) /sc-linux.tar.gz /sc-osx.zip /travis-ci/casher/bash/bin/casher - /travis-ci/gimme/v1.2.5/gimme + /urfave/gimme/v1.2.5/gimme ].each do |filepath| stub.get(filepath) do |*| [200, { 'Content-Type' => 'application/octet-stream' }, "\xa1"] end end - stub.get('/travis-ci/gimme/master/.testdata/sample-binary-linux') do |*| + stub.get('/urfave/gimme/main/.testdata/sample-versions.txt') do |*| [ 200, { 'Content-Type' => 'text/plain' },