diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index cf8212f..080f26d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -116,7 +116,7 @@ jobs: build: name: Build runs-on: ubuntu-latest - needs: package-availability + needs: [package-availability, lint] steps: - name: Checkout uses: actions/checkout@v7.0.1 diff --git a/.woodpecker.yml b/.woodpecker.yml index 7920a1f..45a63c5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -10,13 +10,10 @@ when: - root/** - .woodpecker.yml +# Dockerfile lint and functional testing happen in +# .github/workflows/CI.yml, not here - this pipeline only builds and +# pushes images. steps: - - name: lint-dockerfile - image: hadolint/hadolint:latest-alpine - commands: - - hadolint --version - - hadolint Dockerfile - # Derives image tags from the pinned borgmatic/borg versions in # requirements.txt (e.g. "latest" + "2.1.6-1.4.4") so published tags # track what's actually in the image, not just a floating "latest". @@ -34,7 +31,7 @@ steps: - name: build-and-push image: woodpeckerci/plugin-docker-buildx privileged: true - depends_on: [lint-dockerfile, prepare-tags] + depends_on: [prepare-tags] settings: repo: modem7/borgmatic-docker dockerfile: Dockerfile