From e45d2c15ca2b2cf7af35ae0277dcff3ca4190039 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:05:09 +0200 Subject: [PATCH 1/3] Revert "refactor: cicd cd workflow depends on ci workflow success (#11)" This reverts commit 62a05d5e1e3d8e299c85eb2c79eb6e07ffdc86e5. --- .gitea/workflows/cd.yaml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 8ea9cf4..0b9311c 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -1,11 +1,9 @@ name: CD on: - workflow_run: - workflows: ["CI"] - branches: [main] - types: - - completed + push: + branches: + - main env: DOCKER_REGISTRY: gitea.t000-n.de @@ -38,12 +36,13 @@ jobs: /go_cache key: go_path-${{ steps.hash-go.outputs.hash }} restore-keys: |- - go_cache-${{ steps.hash-go.outputs.hash }} + go_cache-${{ steps.hash-go.outputs.hash }} - name: build run: make build - name: test run: make test + build_and_push: name: Build and push requires: @@ -52,26 +51,26 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - + - name: Login to Registry uses: docker/login-action@v2 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} - + - name: Get Metadata id: meta run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - + - name: Build and push uses: docker/build-push-action@v4 with: -- 2.49.1 From 5a42777549b0517bc2efd9822dc4d2c1be289e02 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:06:29 +0200 Subject: [PATCH 2/3] fix: cicd build_and_push needs test --- .gitea/workflows/cd.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 0b9311c..3a750bb 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -10,7 +10,7 @@ env: jobs: test: - name: test + name: Test runs-on: ubuntu-latest steps: - name: Checkout @@ -36,41 +36,40 @@ jobs: /go_cache key: go_path-${{ steps.hash-go.outputs.hash }} restore-keys: |- - go_cache-${{ steps.hash-go.outputs.hash }} + go_cache-${{ steps.hash-go.outputs.hash }} - name: build run: make build - name: test run: make test - build_and_push: name: Build and push - requires: + needs: - test runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 - + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - + - name: Login to Registry uses: docker/login-action@v2 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_PASSWORD }} - + - name: Get Metadata id: meta run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | tr '[:upper:]' '[:lower:]') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - + - name: Build and push uses: docker/build-push-action@v4 with: -- 2.49.1 From 10c879e0a1aebdd45d09fa231402f66c185867d2 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:09:11 +0200 Subject: [PATCH 3/3] refactor: split test and deploy workflow --- .gitea/workflows/cd.yaml | 43 +++++----------------------------------- .gitea/workflows/ci.yaml | 5 ++++- 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 3a750bb..b4669bb 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -1,51 +1,18 @@ name: CD on: - push: - branches: - - main + workflow_run: + workflows: ["CI"] + branches: [main] + types: + - completed env: DOCKER_REGISTRY: gitea.t000-n.de jobs: - test: - name: Test - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup go - uses: actions/setup-go@v5 - with: - go-version-file: go.mod - check-latest: true - - name: Create cache key - uses: https://gitea.com/actions/go-hashfiles@v0.0.1 - id: hash-go - with: - patterns: | - go.mod - go.sum - - name: cache go - id: cache-go - uses: actions/cache@v4 - with: - path: | - /go_path - /go_cache - key: go_path-${{ steps.hash-go.outputs.hash }} - restore-keys: |- - go_cache-${{ steps.hash-go.outputs.hash }} - - name: build - run: make build - - name: test - run: make test - build_and_push: name: Build and push - needs: - - test runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index dac1a20..ac848d3 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,6 +1,9 @@ name: CI on: pull_request: + push: + branches: + - main env: GOPATH: /go_path @@ -35,7 +38,7 @@ jobs: /go_cache key: go_path-${{ steps.hash-go.outputs.hash }} restore-keys: |- - go_cache-${{ steps.hash-go.outputs.hash }} + go_cache-${{ steps.hash-go.outputs.hash }} - name: build run: make build - name: test -- 2.49.1