diff --git a/.github/workflows/build-push-staging.yml b/.github/workflows/build-push-staging.yml index d3d9c27..9028035 100644 --- a/.github/workflows/build-push-staging.yml +++ b/.github/workflows/build-push-staging.yml @@ -1,4 +1,4 @@ -name: 'build & push docker staging' +name: "build & push docker staging" on: pull_request_target: @@ -23,7 +23,7 @@ jobs: - name: Setup golang environment uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: "1.22" - name: Install dependencies run: go mod tidy @@ -55,4 +55,4 @@ jobs: VERSION=${{ env.REPO_VERSION }} REPO_REV=${{ env.REPO_REV }} DATE=${{ env.BUILD_DATE }} - tags: ${{ secrets.DOCKER_ENDPOINT }}${{ secrets.DOCKER_REPO }}/fishymetrics:${{ env.REPO_VERSION }} \ No newline at end of file + tags: ${{ secrets.DOCKER_ENDPOINT }}${{ secrets.DOCKER_REPO }}/fishymetrics:${{ env.REPO_VERSION }} diff --git a/.github/workflows/pr-prechecks.yml b/.github/workflows/pr-prechecks.yml index 73537c6..eb083b2 100644 --- a/.github/workflows/pr-prechecks.yml +++ b/.github/workflows/pr-prechecks.yml @@ -1,4 +1,4 @@ -name: 'prechecks' +name: "prechecks" on: workflow_dispatch: @@ -15,7 +15,7 @@ jobs: - name: Setup golang environment uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: "1.22" - name: Install dependencies run: go mod tidy @@ -25,12 +25,12 @@ jobs: - name: Run Whitesource/Mend scan run: | - curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - export WS_CHECHKPOLICIES=true - export WS_FORCECHECKALLDEPENDENCIES=true - export WS_FORCEUPDATE=true - export WS_UPDATEINVENTORY=true - java -jar wss-unified-agent.jar -apiKey ${{ secrets.MEND_API_KEY }} -product ${{ secrets.MEND_PRODUCT_NAME }} -project WS-fishymetrics + curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar + export WS_CHECHKPOLICIES=true + export WS_FORCECHECKALLDEPENDENCIES=true + export WS_FORCEUPDATE=true + export WS_UPDATEINVENTORY=true + java -jar wss-unified-agent.jar -apiKey ${{ secrets.MEND_API_KEY }} -product ${{ secrets.MEND_PRODUCT_NAME }} -project WS-fishymetrics build: runs-on: ubuntu-latest @@ -41,11 +41,10 @@ jobs: - name: Setup golang environment uses: actions/setup-go@v5 with: - go-version: '1.21' + go-version: "1.22" - name: Install dependencies run: go mod tidy - name: Make sure app can build run: make build - diff --git a/Dockerfile b/Dockerfile index 3bcbdb4..8fb6b99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM golang:1.21 as build +FROM golang:1.22 as build COPY . /go/src/github.com/comcast/fishymetrics WORKDIR /go/src/github.com/comcast/fishymetrics