Skip to content

Commit

Permalink
Use go 1.17 and regenerate mocks
Browse files Browse the repository at this point in the history
  • Loading branch information
wallyworld committed Feb 1, 2022
1 parent d9694c4 commit 3fa837e
Show file tree
Hide file tree
Showing 162 changed files with 4,889 additions and 4,523 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:
- { os: darwin, arch: amd64 }

steps:
- name: Set up Go 1.14
- name: Set up Go 1.17
uses: actions/[email protected]
with:
go-version: "1.14"
go-version: "1.17"
id: go
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/client-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:

steps:

- name: Set up Go 1.14
- name: Set up Go 1.17
uses: actions/[email protected]
with:
go-version: 1.14
go-version: 1.17
id: go

- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/microk8s-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ jobs:
microk8s: [1.21/stable]

steps:
- name: Set up Go 1.14 for building juju
- name: Set up Go 1.17 for building juju
uses: actions/[email protected]
with:
go-version: "1.14"
go-version: "1.17"
id: go

- name: setup env
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ jobs:
if: github.event.pull_request.draft == false
steps:

- name: Set up Go 1.14
- name: Set up Go 1.17
uses: actions/[email protected]
with:
go-version: 1.14
go-version: 1.17
id: go

- name: Install Dependencies
Expand Down Expand Up @@ -52,10 +52,10 @@ jobs:
if: github.event.pull_request.draft == false
steps:

- name: Set up Go 1.14
- name: Set up Go 1.17
uses: actions/[email protected]
with:
go-version: 1.14
go-version: 1.17
id: go

- name: Checkout
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ concurrent language.

Generally, Juju is built against the most recent version of Go, with the caveat that Go versions are not incremented during a release cycle. This means that `develop` will typically be using the latest version of Go, but any given release branch may lag by one version or so. Check the `go.mod` file at the root of the project for the targeted version of Go, as this is authoritative.

For example, the following indicates that Go 1.14 is targeted:
For example, the following indicates that Go 1.17 is targeted:

```
module github.com/juju/juju
go 1.14
go 1.17
```

### Official distribution
Expand All @@ -51,7 +51,7 @@ Go can be [installed](https://golang.org/doc/install#install) from the official

[Snap](https://snapcraft.io/go) may also be used to install Go on Linux.

snap install go --channel=1.14/stable --classic
snap install go --channel=1.17/stable --classic

## Build Juju and its dependencies

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ endif
# PPA includes the required mongodb-server binaries.
install-snap-dependencies:
## install-snap-dependencies: Install the supported snap dependencies
ifeq ($(shell go version | grep -o "go1.14" || true),go1.14)
@echo Using installed go-1.14
ifeq ($(shell go version | grep -o "go1.17" || true),go1.17)
@echo Using installed go-1.17
else
@echo Installing go-1.14 snap
@sudo snap install go --channel=1.14/stable --classic
@echo Installing go-1.17 snap
@sudo snap install go --channel=1.17/stable --classic
endif

WAIT_FOR_DPKG=sh -c '. "${PROJECT_DIR}/make_functions.sh"; wait_for_dpkg "$$@"' wait_for_dpkg
Expand Down
100 changes: 62 additions & 38 deletions api/base/mocks/caller_mock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3fa837e

Please sign in to comment.