From 52f1fcf266f959a44cbb67391ba1509492d97c92 Mon Sep 17 00:00:00 2001 From: ryuupendragon Date: Thu, 4 Jun 2026 21:03:37 +0530 Subject: [PATCH] Remove unneeded builds --- .gitea/workflows/build-and-push.yml | 55 ++++++++++------------------- .gitea/workflows/build-test.yml | 37 ++++++++----------- 2 files changed, 33 insertions(+), 59 deletions(-) diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml index 86bf61b..aba7927 100644 --- a/.gitea/workflows/build-and-push.yml +++ b/.gitea/workflows/build-and-push.yml @@ -3,10 +3,10 @@ name: Build and Push Docker Images on: workflow_dispatch: push: - branches: [ main ] + branches: [main] paths: - - 'caddy-*/**' - - '.gitea/workflows/build-and-push.yml' + - "caddy-*/**" + - ".gitea/workflows/build-and-push.yml" jobs: build: @@ -14,65 +14,49 @@ jobs: strategy: matrix: variant: - - name: 'cloudflare' - dockerfile: 'caddy-cloudflare/Dockerfile' - context: 'caddy-cloudflare' - - name: 'cloudflare-crowdsec' - dockerfile: 'caddy-cloudflare-crowdsec/Dockerfile' - context: 'caddy-cloudflare-crowdsec' - - name: 'cloudflare-ddns' - dockerfile: 'caddy-cloudflare-ddns/Dockerfile' - context: 'caddy-cloudflare-ddns' - - name: 'cloudflare-ddns-crowdsec' - dockerfile: 'caddy-cloudflare-ddns-crowdsec/Dockerfile' - context: 'caddy-cloudflare-ddns-crowdsec' - - name: 'crowdsec' - dockerfile: 'caddy-crowdsec/Dockerfile' - context: 'caddy-crowdsec' + - name: "cloudflare" + dockerfile: "caddy-cloudflare/Dockerfile" + context: "caddy-cloudflare" + - name: "cloudflare-crowdsec" + dockerfile: "caddy-cloudflare-crowdsec/Dockerfile" + context: "caddy-cloudflare-crowdsec" fail-fast: true steps: - - - name: Checkout code + - name: Checkout code uses: actions/checkout@v6.0.3 - - - name: Parse Caddy version + - name: Parse Caddy version id: version run: | VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2) echo "version=$VERSION" >> $GITHUB_OUTPUT echo "Version from file: $VERSION" - + # Extract semantic version parts MAJOR=$(echo $VERSION | cut -d. -f1) MINOR=$(echo $VERSION | cut -d. -f1-2) - + echo "major_version=$MAJOR" >> $GITHUB_OUTPUT echo "minor_version=$MINOR" >> $GITHUB_OUTPUT echo "Major: $MAJOR, Minor: $MINOR" - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v4.1.0 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4.1.0 with: driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e - - - name: Login to GitHub Container Registry + - name: Login to GitHub Container Registry uses: docker/login-action@v4.2.0 with: registry: ghcr.io username: ${{ vars.GH_USERNAME }} password: ${{ secrets.GH_TOKEN }} - - - name: Login to Docker Hub + - name: Login to Docker Hub uses: docker/login-action@v4.2.0 with: username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker + - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v6.1.0 with: @@ -85,8 +69,7 @@ jobs: type=raw,value=${{ steps.version.outputs.major_version }} type=raw,value=${{ steps.version.outputs.minor_version }} type=raw,value=${{ steps.version.outputs.version }},priority=1000 - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v7.2.0 with: context: ${{ matrix.variant.context }} diff --git a/.gitea/workflows/build-test.yml b/.gitea/workflows/build-test.yml index 260c3e0..8edc35b 100644 --- a/.gitea/workflows/build-test.yml +++ b/.gitea/workflows/build-test.yml @@ -3,10 +3,10 @@ name: Build Test on: workflow_dispatch: pull_request: - branches: [ main ] + branches: [main] paths: - - 'caddy-*/**' - - '.gitea/workflows/**' + - "caddy-*/**" + - ".gitea/workflows/**" jobs: build: @@ -14,43 +14,35 @@ jobs: strategy: matrix: variant: - - name: 'cloudflare' - dockerfile: 'caddy-cloudflare/Dockerfile' - context: 'caddy-cloudflare' - - name: 'crowdsec' - dockerfile: 'caddy-crowdsec/Dockerfile' - context: 'caddy-crowdsec' + - name: "cloudflare" + dockerfile: "caddy-cloudflare/Dockerfile" + context: "caddy-cloudflare" fail-fast: true steps: - - - name: Checkout code + - name: Checkout code uses: actions/checkout@v6.0.3 - - - name: Parse Caddy version + - name: Parse Caddy version id: version run: | VERSION=$(grep -m 1 -Eo 'caddy:[0-9]+\.[0-9]+\.[0-9]' caddy-cloudflare/Dockerfile | cut -d ':' -f2) echo "version=$VERSION" >> $GITHUB_OUTPUT echo "Version from file: $VERSION" - + # Extract semantic version parts MAJOR=$(echo $VERSION | cut -d. -f1) MINOR=$(echo $VERSION | cut -d. -f1-2) - + echo "major_version=$MAJOR" >> $GITHUB_OUTPUT echo "minor_version=$MINOR" >> $GITHUB_OUTPUT echo "Major: $MAJOR, Minor: $MINOR" - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v4.1.0 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4.1.0 with: driver-opts: image=moby/buildkit:v0.23.2@sha256:ddd1ca44b21eda906e81ab14a3d467fa6c39cd73b9a39df1196210edcb8db59e - - - name: Extract metadata (tags, labels) for Docker + - name: Extract metadata (tags, labels) for Docker id: meta uses: docker/metadata-action@v6.1.0 with: @@ -63,8 +55,7 @@ jobs: type=raw,value=${{ steps.version.outputs.major_version }} type=raw,value=${{ steps.version.outputs.minor_version }} type=raw,value=${{ steps.version.outputs.version }},priority=1000 - - - name: Build Test + - name: Build Test uses: docker/build-push-action@v7.2.0 with: context: ${{ matrix.variant.context }}