From 57cdf89c217dd2ffaf9084c5b4d277c510de0ba3 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 15:56:46 -0400 Subject: [PATCH 1/7] Apply htpasswd-style template to main.yaml --- .gitea/workflows/main.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 4177b7c..eca433f 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -1,7 +1,9 @@ name: Main Release + on: push: branches: [master] + jobs: hadolint: runs-on: ubuntu-latest @@ -11,6 +13,7 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile + build-push: runs-on: ubuntu-latest steps: @@ -33,6 +36,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} pull: true + test: runs-on: ubuntu-latest steps: @@ -40,6 +44,7 @@ jobs: - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} + tag: runs-on: ubuntu-latest steps: From e72c5f435341ef59f4e414287396e09493c7170c Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 15:56:48 -0400 Subject: [PATCH 2/7] Apply htpasswd-style template to cron.yaml (keep original schedule) --- .gitea/workflows/cron.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml index d1a60fb..0c2ef64 100644 --- a/.gitea/workflows/cron.yaml +++ b/.gitea/workflows/cron.yaml @@ -1,7 +1,9 @@ name: Nightly Rebuild + on: schedule: - cron: '0 0 * * *' + jobs: hadolint: runs-on: ubuntu-latest @@ -11,6 +13,7 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile + build-push: runs-on: ubuntu-latest steps: From 88bd40c5ed4cb9eb351792bd4dac5659dc77d23b Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 15:56:51 -0400 Subject: [PATCH 3/7] Apply htpasswd-style template to pr.yaml --- .gitea/workflows/pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml index 9bc3fec..462b7a5 100644 --- a/.gitea/workflows/pr.yaml +++ b/.gitea/workflows/pr.yaml @@ -1,7 +1,9 @@ name: PR Checks + on: pull_request: branches: [master] + jobs: hadolint: runs-on: ubuntu-latest @@ -10,6 +12,7 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile + build-test: runs-on: ubuntu-latest steps: From af2d66fecaf11059926b7254b8e23370d04e7b25 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 15:56:55 -0400 Subject: [PATCH 4/7] Apply htpasswd-style template to tag.yaml --- .gitea/workflows/tag.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 86d8d79..714b620 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -1,7 +1,9 @@ name: Tag Release + on: push: tags: ['*'] + jobs: hadolint: runs-on: ubuntu-latest @@ -11,6 +13,7 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile + build-push: runs-on: ubuntu-latest steps: From 7dc3c49831a24d48e3711e3c07d1afba715076b7 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 16:02:36 -0400 Subject: [PATCH 5/7] fix: restructure main.yaml - test mandatory before build, no Docker push on master --- .gitea/workflows/main.yaml | 39 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index eca433f..378bedb 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -1,9 +1,7 @@ name: Main Release - on: push: branches: [master] - jobs: hadolint: runs-on: ubuntu-latest @@ -13,30 +11,6 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile - - build-push: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - id: meta - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6 - with: - images: jcabillot/ansible-lint - tags: | - type=raw,value=latest - - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 - with: - context: . - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - pull: true - test: runs-on: ubuntu-latest steps: @@ -44,8 +18,15 @@ jobs: - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} - + build: + needs: [test] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t jcabillot/ansible-lint:${{ github.sha }} . tag: + needs: [build] runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 @@ -53,10 +34,10 @@ jobs: fetch-depth: 0 - name: Configure git auth run: | - git remote set-url origin "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@scm.cabillot.eu/perso/ansible-lint.git" + git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/perso/ansible-lint.git" - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }} DEFAULT_BUMP: patch RELEASE_BRANCHES: master WITH_V: true From 65c43c4dd99710c90f5ca80cf30422cf80ff424c Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 16:03:29 -0400 Subject: [PATCH 6/7] fix: restructure cron.yaml - add test job, remove :latest tag --- .gitea/workflows/cron.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml index 0c2ef64..1622a19 100644 --- a/.gitea/workflows/cron.yaml +++ b/.gitea/workflows/cron.yaml @@ -1,9 +1,7 @@ name: Nightly Rebuild - on: schedule: - cron: '0 0 * * *' - jobs: hadolint: runs-on: ubuntu-latest @@ -13,8 +11,15 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile - + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} build-push: + needs: [test] runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 @@ -34,8 +39,7 @@ jobs: with: images: jcabillot/ansible-lint tags: | - type=raw,value=latest - type=raw,value=${{ steps.get-latest-tag.outputs.tag }},enable=${{ steps.get-latest-tag.outputs.tag != '' }} + type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }} - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . From bdf8bf0f8dbfce9a1cb93c3a0877b74f03eb9874 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 16:03:32 -0400 Subject: [PATCH 7/7] fix: restructure tag.yaml - add test before build-push --- .gitea/workflows/tag.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 714b620..9b35174 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -1,9 +1,7 @@ name: Tag Release - on: push: tags: ['*'] - jobs: hadolint: runs-on: ubuntu-latest @@ -13,8 +11,15 @@ jobs: - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile - + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} build-push: + needs: [test] runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 @@ -29,6 +34,7 @@ jobs: images: jcabillot/ansible-lint tags: | type=ref,event=tag + type=ref,event=tag,suffix=-latest - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: .