fix: convert all workflows to standard htpasswd pattern (no artifacts)
- Removed artifact upload/download steps from all workflows - Merged build+test into single 'test' job, eliminating artifact dependency - Removed ChristopherHX/gitea-upload-artifact and download-artifact actions - Builds image directly with docker build and runs tests in same job - Push job rebuilds independently with docker/build-push-action - pr.yaml: lint → test only (no push/version bump) - tag.yaml: lint → test → push with semver tags - cron.yaml: keeps original '0 0 * * *' schedule - All pinned SHAs preserved
This commit is contained in:
@@ -11,38 +11,18 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Hadolint
|
- name: Hadolint
|
||||||
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d576162eba76ba5e5 # v3.3.0
|
||||||
|
|
||||||
build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: lint
|
needs: lint
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: docker build -t ci-image:${{ github.sha }} .
|
run: docker build -t ci-image:${{ github.sha }} .
|
||||||
- name: Save image
|
|
||||||
run: docker save ci-image:${{ github.sha }} > image.tar
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
path: image.tar
|
|
||||||
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
|
||||||
- name: Download artifact
|
|
||||||
uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
- name: Load image
|
|
||||||
run: docker load < image.tar
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bash tests/test.sh ci-image:${{ github.sha }}
|
run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
|
|
||||||
@@ -55,28 +35,28 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Docker Metadata
|
- name: Docker Metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
uses: docker/metadata-action@80c7e94dd9b9319bd5d67e4c5d0d6f05c5a2a2e9 # v6
|
||||||
with:
|
with:
|
||||||
images: jcabillot/siege
|
images: jcabillot/siege
|
||||||
tags: |
|
tags: |
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
type=sha
|
type=sha
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
uses: docker/login-action@650006c6eb7dba73a995c9c0bca3b95a915bee7 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
|
uses: docker/build-push-action@f9f3042f7278276550484b5f71a1d0ae9f3b07a # v7
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
- name: Bump version and push tag
|
- name: Bump version and push tag
|
||||||
uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
|
uses: anothrNick/github-tag-action@ed44965e0dbd8abbbd2b46646a7a2b636c312fd8 # v1.75.0
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
DEFAULT_BUMP: patch
|
DEFAULT_BUMP: patch
|
||||||
|
|||||||
@@ -11,38 +11,18 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Hadolint
|
- name: Hadolint
|
||||||
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d576162eba76ba5e5 # v3.3.0
|
||||||
|
|
||||||
build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: lint
|
needs: lint
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: docker build -t ci-image:${{ github.sha }} .
|
run: docker build -t ci-image:${{ github.sha }} .
|
||||||
- name: Save image
|
|
||||||
run: docker save ci-image:${{ github.sha }} > image.tar
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
path: image.tar
|
|
||||||
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
|
||||||
- name: Download artifact
|
|
||||||
uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
- name: Load image
|
|
||||||
run: docker load < image.tar
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bash tests/test.sh ci-image:${{ github.sha }}
|
run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
|
|
||||||
@@ -55,28 +35,28 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Docker Metadata
|
- name: Docker Metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
uses: docker/metadata-action@80c7e94dd9b9319bd5d67e4c5d0d6f05c5a2a2e9 # v6
|
||||||
with:
|
with:
|
||||||
images: jcabillot/siege
|
images: jcabillot/siege
|
||||||
tags: |
|
tags: |
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
type=sha
|
type=sha
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
uses: docker/login-action@650006c6eb7dba73a995c9c0bca3b95a915bee7 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
|
uses: docker/build-push-action@f9f3042f7278276550484b5f71a1d0ae9f3b07a # v7
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
- name: Bump version and push tag
|
- name: Bump version and push tag
|
||||||
uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0
|
uses: anothrNick/github-tag-action@ed44965e0dbd8abbbd2b46646a7a2b636c312fd8 # v1.75.0
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
DEFAULT_BUMP: patch
|
DEFAULT_BUMP: patch
|
||||||
|
|||||||
@@ -10,37 +10,17 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Hadolint
|
- name: Hadolint
|
||||||
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d576162eba76ba5e5 # v3.3.0
|
||||||
|
|
||||||
build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: lint
|
needs: lint
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: docker build -t ci-image:${{ github.sha }} .
|
run: docker build -t ci-image:${{ github.sha }} .
|
||||||
- name: Save image
|
|
||||||
run: docker save ci-image:${{ github.sha }} > image.tar
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
path: image.tar
|
|
||||||
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
|
||||||
- name: Download artifact
|
|
||||||
uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
- name: Load image
|
|
||||||
run: docker load < image.tar
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bash tests/test.sh ci-image:${{ github.sha }}
|
run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
@@ -3,7 +3,7 @@ name: Tag
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- '*'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
lint:
|
lint:
|
||||||
@@ -12,38 +12,18 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Hadolint
|
- name: Hadolint
|
||||||
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
|
uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d576162eba76ba5e5 # v3.3.0
|
||||||
|
|
||||||
build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: lint
|
needs: lint
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Build image
|
- name: Build image
|
||||||
run: docker build -t ci-image:${{ github.sha }} .
|
run: docker build -t ci-image:${{ github.sha }} .
|
||||||
- name: Save image
|
|
||||||
run: docker save ci-image:${{ github.sha }} > image.tar
|
|
||||||
- name: Upload artifact
|
|
||||||
uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
path: image.tar
|
|
||||||
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
|
||||||
- name: Download artifact
|
|
||||||
uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main
|
|
||||||
with:
|
|
||||||
name: docker-image
|
|
||||||
- name: Load image
|
|
||||||
run: docker load < image.tar
|
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: bash tests/test.sh ci-image:${{ github.sha }}
|
run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
|
|
||||||
@@ -54,10 +34,10 @@ jobs:
|
|||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
uses: docker/setup-buildx-action@d7f5e7f509e45cec5cec5c76c4d5afdd7de93df5 # v4
|
||||||
- name: Docker Metadata
|
- name: Docker Metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
uses: docker/metadata-action@80c7e94dd9b9319bd5d67e4c5d0d6f05c5a2a2e9 # v6
|
||||||
with:
|
with:
|
||||||
images: jcabillot/siege
|
images: jcabillot/siege
|
||||||
tags: |
|
tags: |
|
||||||
@@ -65,12 +45,12 @@ jobs:
|
|||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
type=raw,value=latest
|
type=raw,value=latest
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
uses: docker/login-action@650006c6eb7dba73a995c9c0bca3b95a915bee7 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
|
uses: docker/build-push-action@f9f3042f7278276550484b5f71a1d0ae9f3b07a # v7
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
|||||||
Reference in New Issue
Block a user