Skip to content

Commit c05f447

Browse files
authored
Merge branch 'main' into renovate/patch-golang-deps
2 parents 6452108 + be55eeb commit c05f447

File tree

10 files changed

+31
-40
lines changed

10 files changed

+31
-40
lines changed

.builder-image-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.0
1+
0.2.1

.github/actions/setup-go/action.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: "composite"
55
steps:
66
- name: Install go
7-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
7+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
88
with:
99
go-version-file: "go.mod"
1010
cache: true
@@ -15,14 +15,14 @@ runs:
1515
echo "go-build=$(go env GOCACHE)" >> $GITHUB_OUTPUT
1616
echo "go-mod=$(go env GOMODCACHE)" >> $GITHUB_OUTPUT
1717
- name: Go Mod Cache
18-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
18+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
1919
with:
2020
path: ${{ steps.go-cache-paths.outputs.go-mod }}
2121
key: ${{ runner.os }}-go-mod-${{ hashFiles('**/go.sum') }}
2222
restore-keys: |
2323
${{ runner.os }}-go-mod-
2424
- name: Go Build Cache
25-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4
25+
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4
2626
with:
2727
path: ${{ steps.go-cache-paths.outputs.go-build }}
2828
key: ${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}

.github/workflows/builder-image.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1818

1919
- name: Set up Docker Buildx
20-
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3
20+
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3
2121

2222
- name: Login to Docker Hub
23-
uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3
23+
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3
2424
with:
2525
registry: ghcr.io
2626
username: sovereigncloudstack
2727
password: ${{ secrets.GITHUB_TOKEN }}
2828

2929
- name: Build and push
30-
uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6
30+
uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6
3131
with:
3232
file: ./images/builder/Dockerfile
3333
context: ./images/builder
3434
push: true
35-
tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0
35+
tags: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1

.github/workflows/pr-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
if: github.event_name != 'pull_request_target' || !github.event.pull_request.draft
2020
runs-on: ubuntu-latest
2121
container:
22-
image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.0
22+
image: ghcr.io/sovereigncloudstack/csctl-builder:0.2.1
2323
credentials:
2424
username: ${{ github.actor }}
2525
password: ${{ secrets.github_token }}
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
ref: ${{ github.event.pull_request.head.sha }}
3131

.github/workflows/pr-verify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
github_token: ${{ secrets.GITHUB_TOKEN }}
1717

1818
- name: Checkout repository
19-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
19+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
ref: ${{ github.event.pull_request.head.sha }}
2222

@@ -26,7 +26,7 @@ jobs:
2626
- name: Verify Shellcheck
2727
run: make verify-shellcheck
2828

29-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4
29+
- uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
3030
with:
3131
node-version: "18"
3232
- name: Install renovate
@@ -45,7 +45,7 @@ jobs:
4545
app_id: ${{ secrets.SCS_APP_ID }}
4646
private_key: ${{ secrets.SCS_APP_PRIVATE_KEY }}
4747
- name: Generate Size
48-
uses: pascalgn/size-label-action@be08a2d5f857dc99c5b9426cdb5a8ea1aa7f0399 # v0.5.4
48+
uses: pascalgn/size-label-action@f8edde36b3be04b4f65dcfead05dc8691b374348 # v0.5.5
4949
env:
5050
GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
5151
with:

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
goreleaser:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
1717
with:
1818
fetch-depth: 0
1919
- run: git fetch --force --tags
20-
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5
20+
- uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5
2121
with:
2222
go-version: stable
2323

24-
- uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6
24+
- uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6
2525
with:
2626
distribution: goreleaser
2727
version: latest

.github/workflows/schedule-link-checker.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: github.repository == 'SovereignCloudStack/csctl'
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515

1616
- name: Generate Token
1717
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2
@@ -21,7 +21,7 @@ jobs:
2121
private_key: ${{ secrets.SCS_APP_PRIVATE_KEY }}
2222

2323
- name: Link Checker
24-
uses: lycheeverse/lychee-action@7cd0af4c74a61395d455af97419279d86aafaede # v2.0.2
24+
uses: lycheeverse/lychee-action@f81112d0d2814ded911bd23e3beaa9dda9093915 # v2.1.0
2525
id: lychee
2626
env:
2727
GITHUB_TOKEN: "${{ steps.generate-token.outputs.token }}"
@@ -39,7 +39,7 @@ jobs:
3939
link-checker
4040
4141
- name: Update Issue
42-
uses: peter-evans/create-issue-from-file@24452a72d85239eacf1468b0f1982a9f3fec4c94 # v5
42+
uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
4343
with:
4444
title: Link Checker Dashboard
4545
issue-number: "${{ steps.link-checker-issue.outputs.issue_number }}"

.github/workflows/schedule-update-bot.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- name: Generate Token
3636
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2
@@ -45,7 +45,7 @@ jobs:
4545
echo "LOG_LEVEL=${{ github.event.inputs.logLevel || env.LOG_LEVEL }}" >> "$GITHUB_ENV"
4646
4747
- name: Renovate
48-
uses: renovatebot/github-action@21d88b0bf0183abcee15f990011cca090dfc47dd # v40.1.12
48+
uses: renovatebot/github-action@0984fb80fc633b17e57f3e8b6c007fe0dc3e0d62 # v40.3.6
4949
env:
5050
RENOVATE_HOST_RULES: '[{"hostType": "docker", "matchHost": "ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}" }]'
5151
RENOVATE_ALLOWED_POST_UPGRADE_COMMANDS: '[".*"]'

.golangci.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@ linters-settings:
8585
allow-unused: false
8686
allow-leading-space: false
8787
require-specific: true
88-
staticcheck:
89-
go: "1.21"
9088
stylecheck:
91-
go: "1.21"
9289
checks: ["all", "-ST1006"]
9390
dot-import-whitelist:
9491
- "github.com/onsi/gomega"
@@ -242,9 +239,6 @@ linters-settings:
242239
# Suggest the use of rpc.DefaultXXPath.
243240
# Default: false
244241
default-rpc-path: true
245-
# Suggest the use of os.DevNull.
246-
# Default: false
247-
os-dev-null: true
248242
# Suggest the use of sql.LevelXX.String().
249243
# Default: false
250244
sql-isolation-level: true
@@ -254,9 +248,6 @@ linters-settings:
254248
# Suggest the use of constant.Kind.String().
255249
# Default: false
256250
constant-kind: true
257-
# Suggest the use of syslog.Priority.
258-
# Default: false
259-
syslog-priority: true
260251
wrapcheck:
261252
ignoreSigs:
262253
- status.Error(
@@ -276,6 +267,9 @@ issues:
276267
# because we want to help reviewers to focus on reviewing the most relevant
277268
# changes in PRs and avoid nitpicking.
278269
exclude-use-default: false
270+
skip-dirs:
271+
- vendor$
272+
- test/vendor$
279273
exclude-rules:
280274
- linters:
281275
- wrapcheck
@@ -285,6 +279,3 @@ run:
285279
go: "1.21"
286280
allow-parallel-runners: true
287281
modules-download-mode: vendor
288-
skip-dirs:
289-
- vendor$
290-
- test/vendor$

images/builder/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
# If you make changes to this Dockerfile run `make builder-image-push`.
1818

1919
# Install Lychee
20-
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as lychee
20+
FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as lychee
2121
# update: datasource=github-tags depName=lycheeverse/lychee versioning=semver
22-
ENV LYCHEE_VERSION="v0.14.2"
22+
ENV LYCHEE_VERSION="v0.15.1"
2323
# hadolint ignore=DL3018
2424
RUN apk add --no-cache curl && \
2525
curl -L -o /tmp/lychee-${LYCHEE_VERSION}.tgz https://github.com/lycheeverse/lychee/releases/download/${LYCHEE_VERSION}/lychee-${LYCHEE_VERSION}-x86_64-unknown-linux-gnu.tar.gz && \
@@ -28,9 +28,9 @@ RUN apk add --no-cache curl && \
2828
rm -rf /tmp/linux-amd64 /tmp/lychee-${LYCHEE_VERSION}.tgz
2929

3030
# Install Golang CI Lint
31-
FROM docker.io/library/alpine:3.19.1@sha256:6457d53fb065d6f250e1504b9bc42d5b6c65941d57532c072d929dd0628977d0 as golangci
31+
FROM docker.io/library/alpine:3.20.0@sha256:216266c86fc4dcef5619930bd394245824c2af52fd21ba7c6fa0e618657d4c3b as golangci
3232
# update: datasource=github-tags depName=golangci/golangci-lint versioning=semver
33-
ENV GOLANGCI_VERSION="v1.55.2"
33+
ENV GOLANGCI_VERSION="v1.58.2"
3434
WORKDIR /
3535
# hadolint ignore=DL3018,DL4006
3636
RUN apk add --no-cache curl && \
@@ -40,7 +40,7 @@ RUN apk add --no-cache curl && \
4040
FROM docker.io/hadolint/hadolint:v2.12.0-alpine@sha256:7dba9a9f1a0350f6d021fb2f6f88900998a4fb0aaf8e4330aa8c38544f04db42 as hadolint
4141

4242
# Install Trivy
43-
FROM docker.io/aquasec/trivy:0.49.0@sha256:c71420cd77f136e8e900f71d272fb89075f6011019bdcb4b5f7c8e4212f9025e as trivy
43+
FROM docker.io/aquasec/trivy:0.51.3@sha256:9e99f83e58db3f9338ded0bb25179e1d5849a1cbf2e90074a0c4a274f1d151e5 as trivy
4444

4545
############################
4646
# csctl Build Image Base #
@@ -50,7 +50,7 @@ FROM docker.io/library/golang:1.21.6-bullseye@sha256:a8712f27d9ac742e7bded8f81f7
5050
# update: datasource=repology depName=debian_11/skopeo versioning=loose
5151
ENV SKOPEO_VERSION="1.2.2+dfsg1-1+b6"
5252
# update: datasource=github-tags depName=adrienverge/yamllint versioning=semver
53-
ENV YAMLLINT_VERSION="v1.33.0"
53+
ENV YAMLLINT_VERSION="v1.35.1"
5454
# update: datasource=github-tags depName=opt-nc/yamlfixer versioning=semver
5555
ENV YAMLFIXER_VERSION="0.9.15"
5656

0 commit comments

Comments
 (0)