Skip to content

Commit

Permalink
tweaked workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
kian99 committed Jun 27, 2023
1 parent 093b9ff commit f7ca5bb
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 33 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ jobs:
# continue-on-error: true
# steps:
# - uses: actions/checkout@v3
# - uses: ./.github/workflows/setupgo118amd64
# - uses: actions/setup-go@v4
# with:
# go-version-file: 'go.mod'
# - name: golangci-lint
# uses: golangci/golangci-lint-action@v3
# with:
Expand All @@ -24,7 +26,9 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: ./.github/workflows/setupgo118amd64
- uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
- name: Install dependencies
run: sudo apt-get update -y && sudo apt-get install -y gcc git-core gnupg build-essential
- name: Remove installed mongodb
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/oci-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: git fetch --prune --unshallow
- uses: ./.github/workflows/setupgo118amd64
- uses: actions/setup-go@v4
with:
go-version-file: 'go.mod'
- uses: docker/setup-qemu-action@v2
- uses: docker/setup-buildx-action@v2
- name: Setup version and commit
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/setupgo118amd64/action.yaml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/workflows/snap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: git fetch --prune --unshallow
- uses: ./.github/workflows/setupgo118amd64
- uses: actions/setup-go@v4
with:
user: ${{ secrets.GH_USER }}
pat: ${{ secrets.GH_AUTH }}
go-version-file: 'go.mod'
- run: sudo snap install snapcraft --channel=7.x/stable --classic
- run: mkdir -p snap
- run: cp ./snaps/jimm/snapcraft.yaml ./snap/snapcraft.yaml
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/CanonicalLtd/jimm

go 1.18
go 1.20

require (
github.com/canonical/candid v1.12.2
Expand Down
2 changes: 1 addition & 1 deletion internal/rpc/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestDialError(t *testing.T) {
d := *srv.dialer
d.TLSConfig = nil
_, err := d.Dial(context.Background(), srv.URL)
c.Assert(err, qt.ErrorMatches, `x509: certificate signed by unknown authority`)
c.Assert(err, qt.ErrorMatches, `.*x509: certificate signed by unknown authority`)
}

func TestDial(t *testing.T) {
Expand Down

0 comments on commit f7ca5bb

Please sign in to comment.