From e00f61be379206a6a410a0293a9487041fcc4c30 Mon Sep 17 00:00:00 2001 From: Parthib Date: Fri, 15 Sep 2023 13:19:39 +0530 Subject: [PATCH] fix:update go version and workflow files Signed-off-by: Parthib --- .github/workflows/build-and-release.yml | 8 +++--- .github/workflows/ci.yml | 32 +++++++++++------------ .github/workflows/e2etests.yaml | 4 +-- .github/workflows/error-ref-publisher.yml | 6 ++--- .github/workflows/label-commenter.yml | 2 +- .github/workflows/update-oam-defs.yml | 6 ++--- Dockerfile | 2 +- go.mod | 2 +- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 54db1da..803f50a 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -13,20 +13,20 @@ jobs: # needs: [lint, error_check, static_check, vet, sec_check, tests] steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build . docker: name: Docker build and push runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Docker login diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4ea4ad..84b9a67 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: name: Check & Review code runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: - go-version: 1.19 - - uses: actions/checkout@v3 + go-version: 1.21 + - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: @@ -36,26 +36,26 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/kisielk/errcheck@latest; /home/runner/go/bin/errcheck -tags draft ./... static_check: name: Static check runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - uses: dominikh/staticcheck-action@v1.2.0 with: install-go: false @@ -65,13 +65,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go vet -tags draft ./... sec_check: name: Security check @@ -80,7 +80,7 @@ jobs: GO111MODULE: on steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Run Gosec Security Scanner @@ -95,13 +95,13 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - name: Create cluster using KinD uses: engineerd/setup-kind@v0.5.0 with: diff --git a/.github/workflows/e2etests.yaml b/.github/workflows/e2etests.yaml index 4c94d57..4b03d50 100644 --- a/.github/workflows/e2etests.yaml +++ b/.github/workflows/e2etests.yaml @@ -19,7 +19,7 @@ jobs: adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Get version of adapter run: | if [ ${{ github.event_name }} == "release" ];then @@ -75,7 +75,7 @@ jobs: if [ "${{github.event_name }}" == "release" ];then echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV fi - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} diff --git a/.github/workflows/error-ref-publisher.yml b/.github/workflows/error-ref-publisher.yml index 30f89ab..a4966c2 100644 --- a/.github/workflows/error-ref-publisher.yml +++ b/.github/workflows/error-ref-publisher.yml @@ -12,14 +12,14 @@ jobs: if: github.repository == 'meshery/meshery-nginx-sm' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # token here with write access to meshery-nginx-sm repo with: token: ${{ secrets.GH_ACCESS_TOKEN }} ref: "master" - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} @@ -40,7 +40,7 @@ jobs: # to push changes to meshery docs - name: Checkout meshery - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: repository: "meshery/meshery" # token with write access to meshery repository diff --git a/.github/workflows/label-commenter.yml b/.github/workflows/label-commenter.yml index df4d967..7347f98 100644 --- a/.github/workflows/label-commenter.yml +++ b/.github/workflows/label-commenter.yml @@ -18,7 +18,7 @@ jobs: comment: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: master # Set your default branch diff --git a/.github/workflows/update-oam-defs.yml b/.github/workflows/update-oam-defs.yml index 197b0a1..e48f06f 100644 --- a/.github/workflows/update-oam-defs.yml +++ b/.github/workflows/update-oam-defs.yml @@ -10,15 +10,15 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 1 token: ${{ secrets.GH_ACCESS_TOKEN }} ref: "master" - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.21 - name: Run adapter to create components run: | touch log.txt diff --git a/Dockerfile b/Dockerfile index 93d1312..237b261 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19 as builder +FROM golang:1.21 as builder ARG VERSION ARG GIT_COMMITSHA diff --git a/go.mod b/go.mod index 5cf5e2a..6afc591 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-nginx -go 1.19 +go 1.21 replace ( github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334