Skip to content

Commit

Permalink
Merge pull request #46 from noelmcloughlin/version
Browse files Browse the repository at this point in the history
chore(version): bump version to 1.17 latest
  • Loading branch information
myii authored Feb 6, 2022
2 parents 51840b4 + e980808 commit e56eb88
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion golang/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# vim: ft=yaml
---
golang:
version: 1.14.2
version: 1.17
go_path: /usr/local/golang/packages # non-default GOPATH
rootuser: root
rootgroup: root
Expand Down
8 changes: 4 additions & 4 deletions golang/osfamilymap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ FreeBSD:
pkg:
name: go
archive:
source: https://storage.googleapis.com/golang/go1.14.2.freebsd-386.tar.gz
source: https://storage.googleapis.com/golang/go1.17.freebsd-386.tar.gz

OpenBSD:
rootgroup: wheel
Expand All @@ -52,11 +52,11 @@ Windows:
uri: https://golang.org/dl
archive:
name: C:\\golang\\
source: https://golang.org/dl/go1.14.2.windows-amd64.zip
source_hash: 1b5a60b3bbaa81106d5ee03499b5734ec093c6a255abf9a6a067f0f497a57916
source: https://golang.org/dl/go1.17.windows-amd64.zip
source_hash: 2a18bd65583e221be8b9b7c2fbe3696c40f6e27c2df689bbdcc939d49651d151
archive_format: zip

MacOS:
pkg:
archive:
source: https://storage.googleapis.com/golang/go1.14.2.darwin-amd64.tar.gz
source: https://storage.googleapis.com/golang/go1.17.darwin-amd64.tar.gz
13 changes: 7 additions & 6 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# vim: ft=yaml
---
golang:
version: 1.17
lookup:
master: golang-master
# Just for testing purposes
Expand All @@ -14,12 +15,12 @@ golang:
altpriority: 9100

cmd:
goget:
- github.com/golang/example/hello
- github.com/golang/example/outyet
clean:
- github.com/golang/example/hello
- github.com/golang/example/outyet
goget: []
# - github.com/golang/example/hello
# - github.com/golang/example/outyet
clean: []
# - github.com/golang/example/hello
# - github.com/golang/example/outyet

tofs:
# The files_switch key serves as a selector for alternative
Expand Down
6 changes: 3 additions & 3 deletions test/integration/default/controls/archives_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
dir_go, dir_go_owner, dir_go_group =
case system.platform[:family]
when 'bsd'
%w[/usr/local/go1.14.2.freebsd-amd64/go root wheel]
%w[/usr/local/go1.17.freebsd-amd64/go root wheel]
when 'windows'
%w[C:/golang/go1.14.2.windows-amd64/go BUILTIN\\Administrators excluded_by_unless]
%w[C:/golang/go1.17.windows-amd64/go BUILTIN\\Administrators excluded_by_unless]
else
%w[/usr/local/go1.14.2.linux-amd64/go root root]
%w[/usr/local/go1.17.linux-amd64/go root root]
end

control 'golang tar archive' do
Expand Down
2 changes: 1 addition & 1 deletion test/integration/package/controls/packages_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'go'
when 'windows'
# Using a wildcard based on the `DisplayName` in the registry:
# - 'Go Programming Language amd64 go1.14'
# - 'Go Programming Language amd64 go1.nn'
'Go Programming Language*'
else
'golang'
Expand Down

0 comments on commit e56eb88

Please sign in to comment.