Skip to content

Commit 1a2e24e

Browse files
authored
Merge branch 'main' into K8SPSMDB-1466
2 parents e77ba0f + 67aa2c8 commit 1a2e24e

28 files changed

+2847
-100
lines changed

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout code
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v5
1212

1313
- name: "Label PR"
1414
uses: actions/labeler@v5

.github/workflows/reviewdog.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
name: runner / suggester / golangci-lint
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4.1.1
8+
- uses: actions/checkout@v5
99
- name: golangci-lint
1010
uses: golangci/golangci-lint-action@v8
1111
with:
@@ -17,38 +17,38 @@ jobs:
1717
name: runner / suggester / gofmt
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: actions/checkout@v4.1.1
20+
- uses: actions/checkout@v5
2121
- run: gofmt -w -s $(find . -not -path "*/vendor/*" -name "*.go")
22-
- uses: reviewdog/action-suggester@v1
22+
- uses: reviewdog/action-suggester@v1.22.0
2323
with:
2424
tool_name: gofmt
2525

2626
goimports-reviser:
2727
name: runner / suggester / goimports-reviser
2828
runs-on: ubuntu-latest
2929
steps:
30-
- uses: actions/checkout@v4.1.1
30+
- uses: actions/checkout@v5
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: '^1.23'
33+
go-version: '^1.24'
3434
- run: go install -v github.com/incu6us/goimports-reviser/v3@latest
3535
- run: $(go env GOPATH)/bin/goimports-reviser -imports-order "std,general,company,project" -company-prefixes "github.com/percona" ./...
36-
- uses: reviewdog/action-suggester@v1
36+
- uses: reviewdog/action-suggester@v1.22.0
3737
with:
3838
tool_name: goimports-reviser
3939

4040
shfmt:
4141
name: runner / suggester / shfmt
4242
runs-on: ubuntu-latest
4343
steps:
44-
- uses: actions/checkout@v4.1.1
44+
- uses: actions/checkout@v5
4545
- uses: actions/setup-go@v5
4646
with:
47-
go-version: '^1.23'
47+
go-version: '^1.24'
4848
- run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
4949
- run: $(go env GOPATH)/bin/shfmt -f . | grep -v 'vendor' | xargs $(go env GOPATH)/bin/shfmt -bn -ci -s -w
5050
- name: suggester / shfmt
51-
uses: reviewdog/action-suggester@v1
51+
uses: reviewdog/action-suggester@v1.22.0
5252
with:
5353
tool_name: shfmt
5454

@@ -57,7 +57,7 @@ jobs:
5757
name: runner / shellcheck
5858
runs-on: ubuntu-latest
5959
steps:
60-
- uses: actions/checkout@v4.1.1
60+
- uses: actions/checkout@v5
6161
- uses: reviewdog/action-shellcheck@v1
6262
with:
6363
github_token: ${{ secrets.github_token }}
@@ -68,7 +68,7 @@ jobs:
6868
name: runner / misspell
6969
runs-on: ubuntu-latest
7070
steps:
71-
- uses: actions/checkout@v4.1.1
71+
- uses: actions/checkout@v5
7272
- uses: reviewdog/action-misspell@v1
7373
with:
7474
github_token: ${{ secrets.github_token }}
@@ -80,7 +80,7 @@ jobs:
8080
name: runner / alex
8181
runs-on: ubuntu-latest
8282
steps:
83-
- uses: actions/checkout@v4.1.1
83+
- uses: actions/checkout@v5
8484
- uses: reviewdog/action-alex@v1
8585
with:
8686
github_token: ${{ secrets.github_token }}
@@ -92,7 +92,7 @@ jobs:
9292
name: runner / manifests
9393
runs-on: ubuntu-latest
9494
steps:
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9696
- name: check on release branch
9797
if: ${{ contains(github.head_ref, 'release-') || contains(github.base_ref, 'release-') }}
9898
run: |

.github/workflows/scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout code
17-
uses: actions/checkout@v4.1.1
17+
uses: actions/checkout@v5
1818

1919
- name: Set up QEMU
2020
uses: docker/setup-qemu-action@v3

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
- uses: actions/setup-go@v5
99
with:
1010
go-version: '^1.24'
11-
- uses: actions/checkout@v4.1.1
11+
- uses: actions/checkout@v5
1212
- name: run tests
1313
run: make test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ include e2e-tests/release_versions
105105
CERT_MANAGER_VER := $(shell grep -Eo "cert-manager v.*" go.mod|grep -Eo "[0-9]+\.[0-9]+\.[0-9]+")
106106
release: manifests
107107
$(SED) -i "/CERT_MANAGER_VER/s/CERT_MANAGER_VER=\".*/CERT_MANAGER_VER=\"$(CERT_MANAGER_VER)\"/" e2e-tests/functions
108-
$(SED) -i "/Version = \"/s/Version = \".*/Version = \"$(VERSION)\"/" version/version.go
108+
echo "$(VERSION)" > pkg/version/version.txt
109109
$(SED) -i \
110110
-e "s/crVersion: .*/crVersion: $(VERSION)/" \
111111
-e "/^spec:/,/^ image:/{s#image: .*#image: $(IMAGE_MONGOD80)#}" deploy/cr-minimal.yaml

0 commit comments

Comments
 (0)