Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/go_modules/github.com/aws/aws-sdk…
Browse files Browse the repository at this point in the history
…-go-1.48.14
  • Loading branch information
artemgavrilov authored Dec 7, 2023
2 parents fb589c0 + 47a0f89 commit f999fbc
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/admin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clean.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
env:
# to avoid error due to `go version` accepting -v flag with an argument since 1.15
GOFLAGS: ""
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go.version }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qan-api2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vmproxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Go release
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version-file: ${{ github.workspace }}/go.mod
cache: false
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/build-client-deb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ main() {
apt-get update
case "\$OS_VERSION" in
11 | 22.04) apt-get -y install git lsb-release devscripts dh-make;;
11 | 12 | 22.04) apt-get -y install git lsb-release devscripts dh-make;;
*) apt-get -y install git lsb-release devscripts dh-make dh-systemd;;
esac
mkdir -p /tmp/pmm
Expand Down

0 comments on commit f999fbc

Please sign in to comment.