diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 09d93850..a42ab96d 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -15,24 +15,24 @@ jobs: # needs: [lint, error_check, static_check, vet, sec_check, tests] steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build . docker: name: Docker build and push runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 1 - name: Docker login - uses: azure/docker-login@v1 + uses: azure/docker-login@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -60,7 +60,7 @@ jobs: docker push ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::7} - name: Docker Hub Description if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success() - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v5 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 57f28208..9ec190be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,12 +16,12 @@ jobs: name: golangci-lint runs-on: ubuntu-22.04 steps: - - uses: actions/setup-go@v5 + - uses: actions/setup-go@v6 with: - go-version: 1.23 - - uses: actions/checkout@v4 + go-version: 1.25 + - uses: actions/checkout@v6 - name: golangci-lint - uses: golangci/golangci-lint-action@v6 + uses: golangci/golangci-lint-action@v9 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. version: latest @@ -34,15 +34,15 @@ jobs: ACTIONS_ALLOW_UNSECURE_COMMANDS: true steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v5 + uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Create cluster using KinD - uses: engineerd/setup-kind@v0.5.0 + uses: engineerd/setup-kind@v0 with: version: "v0.11.1" - run: | diff --git a/.github/workflows/component-generator.yaml b/.github/workflows/component-generator.yaml index 1a5c4130..142dbd44 100644 --- a/.github/workflows/component-generator.yaml +++ b/.github/workflows/component-generator.yaml @@ -13,15 +13,15 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 1 token: ${{ secrets.GH_ACCESS_TOKEN }} ref: "master" - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Run adapter to create components run: | touch log.txt @@ -36,8 +36,7 @@ jobs: done rm log.txt - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 - with: + uses: stefanzweifel/git-auto-commit-action@v7 file_pattern: templates/ commit_user_name: l5io commit_user_email: ci@layer5.io diff --git a/.github/workflows/components-to-doc.yml b/.github/workflows/components-to-doc.yml index 792609b2..2c504a7a 100644 --- a/.github/workflows/components-to-doc.yml +++ b/.github/workflows/components-to-doc.yml @@ -10,7 +10,7 @@ jobs: CopyComponents: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Make components to .md files run: | @@ -50,7 +50,7 @@ jobs: done - name: Pushes folder to main repo - uses: crykn/copy_folder_to_another_repo_action@v1.0.6 + uses: crykn/copy_folder_to_another_repo_action@v1 env: API_TOKEN_GITHUB: ${{ secrets.GH_ACCESS_TOKEN }} with: diff --git a/.github/workflows/e2etests.yml b/.github/workflows/e2etests.yml index 0b69de20..e45afa62 100644 --- a/.github/workflows/e2etests.yml +++ b/.github/workflows/e2etests.yml @@ -21,7 +21,7 @@ jobs: adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get version of adapter run: | if [ ${{ github.event_name }} == "release" ];then @@ -40,7 +40,7 @@ jobs: yq e -i '.services.istio.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml cat ./.github/install/deploy.yaml - name: Uploading file - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: patternfile path: ./.github/install/deploy.yaml @@ -78,12 +78,12 @@ jobs: if [ "${{github.event_name }}" == "release" ];then echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV fi - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: patternfile - name: Add commit SHORT_SHA @@ -118,7 +118,7 @@ jobs: mv test.md $filename.md rm data.json - name: Commit - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v7 with: file_pattern: docs commit_user_name: l5io @@ -134,7 +134,7 @@ jobs: adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get version of adapter run: | if [ ${{ github.event_name }} == "release" ];then @@ -155,7 +155,7 @@ jobs: yq e -i '.services.prometheus.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithaddons.yaml cat ./.github/install/deploywithaddons.yaml - name: Uploading file - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: patternfile-servicemesh-addon path: ./.github/install/deploywithaddons.yaml @@ -193,12 +193,12 @@ jobs: if [ "${{github.event_name }}" == "release" ];then echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV fi - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: patternfile-servicemesh-addon - name: Add commit SHORT_SHA @@ -235,7 +235,7 @@ jobs: mv test.md $filename.md rm data.json - name: Commit - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v7 with: file_pattern: docs commit_user_name: l5io @@ -251,7 +251,7 @@ jobs: adapter_version: ${{ env.version }} steps: - name: Checkout Code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Get version of adapter run: | if [ ${{ github.event_name }} == "release" ];then @@ -270,7 +270,7 @@ jobs: yq e -i '.services.istioinstallation.settings.istioVersion="${{ steps.gettag.outputs.release }}"' ./.github/install/deploywithsampleapp.yaml cat ./.github/install/deploywithsampleapp.yaml - name: Uploading file - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v6 with: name: patternfile-servicemesh-sample-app path: ./.github/install/deploywithsampleapp.yaml @@ -308,12 +308,12 @@ jobs: if [ "${{github.event_name }}" == "release" ];then echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV fi - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: repository: meshery/meshery token: ${{ secrets.GH_ACCESS_TOKEN }} - name: DownloadJSON - uses: actions/download-artifact@v4 + uses: actions/download-artifact@v6 with: name: patternfile-servicemesh-sample-app - name: Add commit SHORT_SHA @@ -352,7 +352,7 @@ jobs: mv test.md $filename.md rm data.json - name: Commit - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v7 with: file_pattern: docs commit_user_name: l5io diff --git a/.github/workflows/error-ref-publisher.yaml b/.github/workflows/error-ref-publisher.yaml index 130ff748..533279d3 100644 --- a/.github/workflows/error-ref-publisher.yaml +++ b/.github/workflows/error-ref-publisher.yaml @@ -12,23 +12,23 @@ jobs: if: github.repository == 'meshery/meshery-istio' runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 # token here with write access to meshery-istio repo with: token: ${{ secrets.GH_ACCESS_TOKEN }} ref: "master" - name: Setup Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: 1.23 + go-version: 1.25 - name: Run utility run: | go run github.com/meshery/meshkit/cmd/errorutil -d . update --skip-dirs meshery -i ./helpers -o ./helpers # to update errorutil* files in meshkit repo - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v7 with: commit_user_name: l5io commit_user_email: ci@meshery.io @@ -39,7 +39,7 @@ jobs: # to push changes to meshery docs - name: Checkout meshery - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: repository: "meshery/meshery" # token with write access to meshery repository @@ -52,7 +52,7 @@ jobs: echo '{ "errors_export": "" }' | jq --slurpfile export ./helpers/errorutil_errors_export.json '.errors_export = $export[0]' > ./meshery/docs/_data/errorref/istio_errors_export.json - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@v4 + uses: stefanzweifel/git-auto-commit-action@v7 with: repository: ./meshery commit_user_name: l5io diff --git a/.github/workflows/label-commenter.yml b/.github/workflows/label-commenter.yml index 62c1ee59..c2f69874 100644 --- a/.github/workflows/label-commenter.yml +++ b/.github/workflows/label-commenter.yml @@ -18,7 +18,7 @@ jobs: comment: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: master # Set your default branch diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml index c12d850b..cf3551b6 100644 --- a/.github/workflows/multi-platform.yml +++ b/.github/workflows/multi-platform.yml @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-22.04 steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Identify Release Values if: "${{ github.event.inputs.release-ver}} != 'v' }}" run: | @@ -90,7 +90,7 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Build and Push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: "{{defaultContext}}" push: true @@ -100,7 +100,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} platforms: linux/amd64,linux/arm64 - name: Docker Hub Description - uses: peter-evans/dockerhub-description@v3 + uses: peter-evans/dockerhub-description@v5 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index a68f2cde..e9df2e87 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-22.04 steps: # Drafts your next Release notes as Pull Requests are merged into "master" - - uses: release-drafter/release-drafter@v5 + - uses: release-drafter/release-drafter@v6 with: config-name: release-drafter.yml env: diff --git a/.github/workflows/slack.yml b/.github/workflows/slack.yml index 2169fc04..cb14b9ad 100644 --- a/.github/workflows/slack.yml +++ b/.github/workflows/slack.yml @@ -17,7 +17,7 @@ jobs: echo "STARS=$(curl --silent 'https://api.github.com/repos/${{ github.repository }}' -H 'Accept: application/vnd.github.preview' | jq '.stargazers_count')" >> $GITHUB_ENV - name: Notify Slack - uses: slackapi/slack-github-action@v2.1.1 + uses: slackapi/slack-github-action@v2 with: method: chat.postMessage token: ${{ secrets.SLACK_BOT_TOKEN }} @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Notify Slack - uses: slackapi/slack-github-action@v2.1.1 + uses: slackapi/slack-github-action@v2 with: method: chat.postMessage token: ${{ secrets.SLACK_BOT_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 4f73429c..059d2604 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG GOLANG_VERSION=1.23 -FROM golang:${GOLANG_VERSION} as builder +ARG GOLANG_VERSION=1.25 +FROM golang:${GOLANG_VERSION} AS builder ARG VERSION ARG GIT_COMMITSHA diff --git a/build/Makefile.core.mk b/build/Makefile.core.mk index 4b6aa1c1..62b48385 100644 --- a/build/Makefile.core.mk +++ b/build/Makefile.core.mk @@ -19,7 +19,7 @@ GIT_VERSION = $(shell git describe --tags `git rev-list --tags --max-count=1`) GIT_COMMITSHA = $(shell git rev-list -1 HEAD) GIT_STRIPPED_VERSION=$(shell git describe --tags `git rev-list --tags --max-count=1` | cut -c 2-) -GOVERSION = 1.23 +GOVERSION = 1.25 GOPATH = $(shell go env GOPATH) GOBIN = $(GOPATH)/bin diff --git a/go.mod b/go.mod index db893916..9f17b8a4 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-istio -go 1.23.4 +go 1.25.0 replace ( //github.com/docker/docker => github.com/moby/moby v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible