From fd4164a9152825a60aaf1e954abfaafcfc4cdea0 Mon Sep 17 00:00:00 2001 From: "cluster-stack-bot[bot]" <143188378+cluster-stack-bot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 11:16:23 +0000 Subject: [PATCH 1/5] :seedling: Update Github Actions group to v4.1.5 | datasource | package | from | to | | ----------- | ---------------- | ------ | ------ | | github-tags | actions/checkout | v4.1.4 | v4.1.5 | Signed-off-by: kranurag7 --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 4 ++-- .github/workflows/pr-verify.yml | 2 +- .github/workflows/schedule-scan-image.yml | 4 ++-- .github/workflows/schedule-update-bot.yaml | 2 +- .github/workflows/test.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 2bf1ca5f..18efdb9a 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.7 +1.1.8 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index b51ef552..601cbf5b 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,13 +21,13 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.7 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/pr-verify.yml b/.github/workflows/pr-verify.yml index 9030db22..529438fe 100644 --- a/.github/workflows/pr-verify.yml +++ b/.github/workflows/pr-verify.yml @@ -16,7 +16,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index d04588f8..7562525e 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,13 +9,13 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.7 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Fixup git permissions # https://github.com/actions/checkout/issues/766 shell: bash diff --git a/.github/workflows/schedule-update-bot.yaml b/.github/workflows/schedule-update-bot.yaml index 8694726f..81e79c3c 100644 --- a/.github/workflows/schedule-update-bot.yaml +++ b/.github/workflows/schedule-update-bot.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Generate Token uses: actions/create-github-app-token@a0de6af83968303c8c955486bf9739a57d23c7f1 # v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5bf0ccf2..05176324 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: timeout-minutes: 10 steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Coverage result name id: name run: | From ef7328092e37960f4de2bf13cd9b7a761d6269b4 Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Thu, 16 May 2024 01:00:08 +0530 Subject: [PATCH 2/5] update golangci-lint version to 1.58.1 Signed-off-by: kranurag7 --- images/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index b9d1e3a1..b7d65f3f 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -60,7 +60,7 @@ RUN apk add -U --no-cache \ # Install Golang CI Lint FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v1.58.0" +ENV GOLANGCI_VERSION="v1.58.1" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \ From 30f8991d696ac6e2d9e6282485abdd46321fec6e Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Thu, 16 May 2024 01:12:25 +0530 Subject: [PATCH 3/5] update to 1.1.9 image of cso-builder Signed-off-by: kranurag7 --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 18efdb9a..512a1faa 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.8 +1.1.9 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 601cbf5b..44962827 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,7 +21,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.9 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index 7562525e..090f9032 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,7 +9,7 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.9 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} From 01658a1da84f8e8bd3b4e485538977c8ae4c5957 Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Tue, 28 May 2024 10:45:43 +0530 Subject: [PATCH 4/5] Revert "update to 1.1.9 image of cso-builder" This reverts commit e8f9a887659f9c11f9bb7244cc2823c6fcbda36f. Signed-off-by: kranurag7 --- .builder-image-version.txt | 2 +- .github/workflows/pr-lint.yml | 2 +- .github/workflows/schedule-scan-image.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.builder-image-version.txt b/.builder-image-version.txt index 512a1faa..18efdb9a 100644 --- a/.builder-image-version.txt +++ b/.builder-image-version.txt @@ -1 +1 @@ -1.1.9 +1.1.8 diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 44962827..601cbf5b 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -21,7 +21,7 @@ jobs: if: github.event_name != 'pull_request' || !github.event.pull_request.draft runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.9 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} diff --git a/.github/workflows/schedule-scan-image.yml b/.github/workflows/schedule-scan-image.yml index 090f9032..7562525e 100644 --- a/.github/workflows/schedule-scan-image.yml +++ b/.github/workflows/schedule-scan-image.yml @@ -9,7 +9,7 @@ jobs: name: Trivy runs-on: ubuntu-latest container: - image: ghcr.io/sovereigncloudstack/cso-builder:1.1.9 + image: ghcr.io/sovereigncloudstack/cso-builder:1.1.8 credentials: username: ${{ github.actor }} password: ${{ secrets.github_token }} From 92e33ae7539e0047debe32d65bc5e43ac50b73dc Mon Sep 17 00:00:00 2001 From: kranurag7 Date: Tue, 28 May 2024 10:46:55 +0530 Subject: [PATCH 5/5] bump golangci-lint version Signed-off-by: kranurag7 --- images/builder/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index b7d65f3f..35881713 100644 --- a/images/builder/Dockerfile +++ b/images/builder/Dockerfile @@ -60,7 +60,7 @@ RUN apk add -U --no-cache \ # Install Golang CI Lint FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci # update: datasource=github-tags depName=golangci/golangci-lint versioning=semver -ENV GOLANGCI_VERSION="v1.58.1" +ENV GOLANGCI_VERSION="v1.59.0" WORKDIR / # hadolint ignore=DL3018,DL4006 RUN apk add --no-cache curl && \