From 1c56534e265f0db965b3d2784a90129bf465b003 Mon Sep 17 00:00:00 2001 From: V1ck3s Date: Thu, 8 Jan 2026 23:44:31 +0100 Subject: [PATCH] ci: split workflows into separate CI and Docker jobs - Split ci.yml into two workflows for cleaner PR checks - ci.yml: runs build-and-test on PRs and pushes (no Docker) - docker.yml: runs build-and-test + Docker build/push on merges, tags, and manual triggers - Eliminates 'docker: skipping' status on open PRs --- .github/workflows/ci.yml | 63 ++---------------------- .github/workflows/docker.yml | 92 ++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 60 deletions(-) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e686273..685235d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,25 +1,18 @@ -name: CI/CD +name: CI on: - workflow_dispatch: push: - tags: ['v*'] + branches: [master, dev] pull_request: - types: [closed] + types: [opened, synchronize, reopened] branches: [master, dev] env: DOTNET_VERSION: "9.0.x" - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} jobs: build-and-test: runs-on: ubuntu-latest - if: | - github.event_name == 'workflow_dispatch' || - github.event_name == 'push' || - (github.event_name == 'pull_request' && github.event.pull_request.merged == true) steps: - name: Checkout @@ -38,53 +31,3 @@ jobs: - name: Test run: dotnet test --configuration Release --no-build --verbosity normal - - docker: - needs: build-and-test - runs-on: ubuntu-latest - - permissions: - contents: read - packages: write - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=ref,event=branch - type=sha,prefix= - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} - type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..0bdcd17 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,92 @@ +name: Docker Build & Push + +on: + workflow_dispatch: + push: + tags: ['v*'] + branches: [master, dev] + pull_request: + types: [closed] + branches: [master, dev] + +env: + DOTNET_VERSION: "9.0.x" + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: ${{ env.DOTNET_VERSION }} + + - name: Restore dependencies + run: dotnet restore + + - name: Build + run: dotnet build --configuration Release --no-restore + + - name: Test + run: dotnet test --configuration Release --no-build --verbosity normal + + docker: + needs: build-and-test + runs-on: ubuntu-latest + # Only run docker build/push on merged PRs, tags, or manual triggers + if: | + github.event_name == 'workflow_dispatch' || + github.event_name == 'push' || + (github.event_name == 'pull_request' && github.event.pull_request.merged == true) + + permissions: + contents: read + packages: write + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=ref,event=branch + type=sha,prefix= + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} + type=raw,value=dev,enable=${{ github.ref == 'refs/heads/dev' }} + + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max