Skip to content

Commit 78ba629

Browse files
authored
Merge pull request #176 from meshery/horti/ci/chore
horti/ci/chore
2 parents 799da20 + 1da4017 commit 78ba629

File tree

6 files changed

+53
-18
lines changed

6 files changed

+53
-18
lines changed

.github/workflows/ci.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
env:
2-
GO_VERSION: '1.20'
2+
GO_VERSION: '1.23'
33

44
name: Meshery NSM
55
on:
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check out code
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@master
2121
with:
2222
fetch-depth: 1
2323
- name: Setup Go
24-
uses: actions/setup-go@v4
24+
uses: actions/setup-go@master
2525
with:
2626
go-version: ${{ env.GO_VERSION }}
2727
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@v3
28+
uses: golangci/golangci-lint-action@master
2929
with:
3030
version: v1.52
3131
args: --timeout=5m
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
fetch-depth: 1
4040
- name: Setup Go
41-
uses: actions/setup-go@v4
41+
uses: actions/setup-go@master
4242
with:
4343
go-version: ${{ env.GO_VERSION }}
4444
- run: go install github.com/kisielk/errcheck@latest; errcheck -tags draft ./...
@@ -51,7 +51,7 @@ jobs:
5151
with:
5252
fetch-depth: 1
5353
- name: Setup Go
54-
uses: actions/setup-go@v4
54+
uses: actions/setup-go@master
5555
with:
5656
go-version: ${{ env.GO_VERSION }}
5757
- run: go install honnef.co/go/tools/cmd/staticcheck@latest; PKGS=$(go list ./... | grep -vF /meshes); staticcheck -tags draft -checks all $PKGS # https://staticcheck.io/docs/checks
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
fetch-depth: 1
107107
- name: Setup Go
108-
uses: actions/setup-go@v4
108+
uses: actions/setup-go@master
109109
with:
110110
go-version: ${{ env.GO_VERSION }}
111111
- run: go build .

.github/workflows/error-ref-publisher.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
env:
2-
GO_VERSION: 1.20
2+
GO_VERSION: 1.23
33

44
name: Meshkit Error Codes Utility Runner
55
on:
@@ -12,17 +12,17 @@ on:
1212
jobs:
1313
error-ref:
1414
name: Error codes utility
15-
if: github.repository == 'meshery/meshery-nsm'
15+
if: github.repository == 'meshery-extensions/meshery-nsm'
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@master
1919
# token here with write access to nsm repo
2020
with:
2121
token: ${{ secrets.GH_ACCESS_TOKEN }}
2222
ref: 'master'
2323

2424
- name: Setup Go
25-
uses: actions/setup-go@v1
25+
uses: actions/setup-go@master
2626
with:
2727
go-version: ${{ env.GO_VERSION }}
2828

@@ -32,7 +32,7 @@ jobs:
3232
go run github.com/layer5io/meshkit/cmd/errorutil -d . update --skip-dirs meshery -i ./helpers -o ./helpers
3333
# to update errorutil* files in meshkit repo
3434
- name: Commit changes
35-
uses: stefanzweifel/git-auto-commit-action@v4
35+
uses: stefanzweifel/git-auto-commit-action@master
3636
with:
3737
commit_user_name: l5io
3838
commit_user_email: [email protected]
@@ -43,7 +43,7 @@ jobs:
4343

4444
# to push changes to meshery docs
4545
- name: Checkout meshery
46-
uses: actions/checkout@v2
46+
uses: actions/checkout@master
4747
with:
4848
repository: "meshery/meshery"
4949
# token with write access to meshery repository
@@ -56,7 +56,7 @@ jobs:
5656
echo '{ "errors_export": "" }' | jq --slurpfile export ./helpers/errorutil_errors_export.json '.errors_export = $export[0]' > ./meshery/docs/_data/errorref/nsm_errors_export.json
5757
5858
- name: Commit changes
59-
uses: stefanzweifel/git-auto-commit-action@v4
59+
uses: stefanzweifel/git-auto-commit-action@master
6060
with:
6161
repository: ./meshery
6262
commit_user_name: l5io

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20 as builder
1+
FROM golang:1.23 as builder
22

33
ARG VERSION
44
ARG GIT_COMMITSHA

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ proto:
1414
protoc -I meshes/ meshes/meshops.proto --go_out=plugins=grpc:./meshes/
1515

1616
docker:
17-
docker build -t layer5/meshery-nsm .
17+
docker build -t meshery/meshery-nsm .
1818

1919
docker-run:
2020
(docker rm -f meshery-nsm) || true
2121
docker run --name meshery-nsm -d \
2222
-p 10004:10004 \
2323
-e DEBUG=true \
24-
layer5/meshery-nsm
24+
meshery/meshery-nsm
2525

2626
run:
2727
DEBUG=true go run main.go

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/layer5io/meshery-nsm
22

3-
go 1.20
3+
go 1.23
44

55
replace (
66
github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334

0 commit comments

Comments
 (0)