From 7165d3aeae9df3b15221847df2f81423be03c67c Mon Sep 17 00:00:00 2001 From: retornam Date: Fri, 2 May 2025 22:38:51 -0700 Subject: [PATCH 1/2] Upgrade outdated dependency actions Upgraded the following - actions/checkout to v4 - reviewdog/action-shellcheck v1.30.0 - brpaz/structure-tests-action@v1.4.0 - cycjimmy/semantic-release-action@v4 - image ubuntu to 24.04 as they were all out of date. Signed-off-by: Raymond Etornam --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54763d8..a6eeb5f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,44 +16,44 @@ permissions: jobs: lint: name: Lint - runs-on: ubuntu-20.04 - container: pipelinecomponents/hadolint:0.10.1 + runs-on: ubuntu-24.04 + container: pipelinecomponents/hadolint:0.27.2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run hadolint run: hadolint Dockerfile shellcheck: name: ShellCheck - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run ShellCheck - uses: reviewdog/action-shellcheck@v1.16.0 + uses: reviewdog/action-shellcheck@v1.30.0 with: reporter: github-pr-review fail_on_error: true build-test: name: Build and Test - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: [ "lint", "shellcheck" ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build Docker image run: docker build -t $TEST_IMAGE_NAME . - name: Run Structure tests - uses: brpaz/structure-tests-action@v1.1.2 + uses: brpaz/structure-tests-action@v1.4.0 with: image: ${{ env.TEST_IMAGE_NAME }} integration-tests: name: Integration Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: build-test steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Run integration test 1 uses: ./ @@ -120,11 +120,11 @@ jobs: release: if: github.event_name == 'push' && github.ref == 'refs/heads/master' name: Release - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: integration-tests steps: - - uses: actions/checkout@v2 - - uses: cycjimmy/semantic-release-action@v3 + - uses: actions/checkout@v4 + - uses: cycjimmy/semantic-release-action@v4 with: extra_plugins: | @semantic-release/git From 49702b1d8bc74f9373c32b25c7cee81d5dcee62f Mon Sep 17 00:00:00 2001 From: retornam Date: Fri, 2 May 2025 22:46:14 -0700 Subject: [PATCH 2/2] Replace outdated docker images sdesbure/yamllint hasn't been updated in 4 years zemanlx/container-structure-test:v1.8.0-alpine is no longer maintained sdesbure/* replaced with pipelinecomponents/yamllint:0.34.0 zemanlx/* replaced with with ghcr.io/googlecontainertools/container-structure-test:1.19.3 Signed-off-by: Raymond Etornam --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a35729b..00564b5 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ IMAGE_NAME:=hadolint-action - +YAMLLINT_VERSION:=0.34.0 +HADOLINT_VERSION:=1.19.3 lint-dockerfile: ## Runs hadolint against application dockerfile @docker run --rm -v "$(PWD):/data" -w "/data" hadolint/hadolint hadolint Dockerfile lint-yaml: ## Lints yaml configurations - @docker run --rm -v "$(PWD):/yaml" sdesbure/yamllint yamllint . + @docker run --rm -v "$(PWD):/yaml" pipelinecomponents/yamllint:$(YAMLLINT_VERSION) yamllint . build: ## Builds the docker image @docker build . -t $(IMAGE_NAME) @@ -13,7 +14,7 @@ build: ## Builds the docker image test: build ## Runs a test in the image @docker run -i --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v ${PWD}:/test zemanlx/container-structure-test:v1.8.0-alpine \ + -v ${PWD}:/test ghcr.io/googlecontainertools/container-structure-test:$(HADOLINT_VERSION) \ test \ --image $(IMAGE_NAME) \ --config test/structure-tests.yaml