Skip to content

Update Go and gimme versions. #1148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 25, 2017
Merged

Update Go and gimme versions. #1148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3389372
Update Go versions.
AlekSi Aug 25, 2017
65c4bc5
Update gimme.
AlekSi Aug 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/travis/build/config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ def ghc_version_aliases_hash
force_reinstall: ENV.fetch('TRAVIS_BUILD_GIMME_FORCE_REINSTALL', ''),
url: ENV.fetch(
'TRAVIS_BUILD_GIMME_URL',
'https://raw.githubusercontent.com/travis-ci/gimme/v1.0.0/gimme'
'https://raw.githubusercontent.com/travis-ci/gimme/v1.2.0/gimme'
)
},
go_version: ENV.fetch('TRAVIS_BUILD_GO_VERSION', '1.8.3'),
go_version: ENV.fetch('TRAVIS_BUILD_GO_VERSION', '1.9'),
internal_ruby_regex: ENV.fetch(
'TRAVIS_BUILD_INTERNAL_RUBY_REGEX',
'^ruby-(2\.[0-2]\.[0-9]|1\.9\.3)'
Expand Down
12 changes: 7 additions & 5 deletions public/version-aliases/go.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"1": "1.9",
"1.x": "1.9",
"1.x.x": "1.9",
"1.2": "1.2.2",
"1.2.2": "1.2.2",
"1": "1.8.3",
"1.x": "1.8.3",
"1.x.x": "1.8.3",
"1.2.x": "1.2.2",
"1.3.3": "1.3.3",
"1.3.x": "1.3.3",
Expand All @@ -16,6 +17,7 @@
"1.7.x": "1.7.6",
"1.8.3": "1.8.3",
"1.8.x": "1.8.3",
"1.2": "1.2.2",
"1.9": "1.9",
"1.9.x": "1.9",
"go1": "go1"
}
}

This comment was marked as spam.

Sign in to view

5 changes: 2 additions & 3 deletions spec/build/script/go_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
end

it 'sets TRAVIS_GO_VERSION' do
should include_sexp [:export, ['TRAVIS_GO_VERSION', '1.8.3']]
should include_sexp [:export, ['TRAVIS_GO_VERSION', '1.9']]
end

it 'conditionally sets GOMAXPROCS to 2' do
expect(sexp_find(subject, [:if, '-z $GOMAXPROCS'])).to include_sexp [:export, ['GOMAXPROCS', '2']]
end

it 'sets the default go version if not :go config given' do
should include_sexp [:cmd, 'GIMME_OUTPUT=$(gimme 1.8.3 | tee -a $HOME/.bashrc) && eval "$GIMME_OUTPUT"', assert: true, echo: true, timing: true]
should include_sexp [:cmd, 'GIMME_OUTPUT=$(gimme 1.9 | tee -a $HOME/.bashrc) && eval "$GIMME_OUTPUT"', assert: true, echo: true, timing: true]
end

it 'sets the go version from config :go' do
Expand Down Expand Up @@ -159,4 +159,3 @@
end
end
end