From a7e50bcec941f8f35e4fde57b98949b5e12576c1 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:32:15 +0200 Subject: [PATCH 1/4] Revert "fix: cicd workflow interdependency (#13)" This reverts commit e0412f87b601c83087defd1e74c00acbe158ba52. --- .gitea/workflows/cd.yaml | 3 +-- .gitea/workflows/ci.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index d7993f1..b4669bb 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -2,7 +2,7 @@ name: CD on: workflow_run: - workflows: ["ci.yaml"] + workflows: ["CI"] branches: [main] types: - completed @@ -14,7 +14,6 @@ jobs: build_and_push: name: Build and push runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 28b7169..ac848d3 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,5 +1,4 @@ name: CI - on: pull_request: push: -- 2.49.1 From 7739f324f3f4788fc5cb224dae2fad39a477b671 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:32:15 +0200 Subject: [PATCH 2/4] Revert "fix: cicd dependency between workflow (#12)" This reverts commit 1a25992f031bcb5cb9a3220d314c66c6f572ab56. --- .gitea/workflows/cd.yaml | 35 +++++++++++++++++++++++++++++++++++ .gitea/workflows/ci.yaml | 5 +---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index b4669bb..8ea9cf4 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -11,8 +11,43 @@ 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 + requires: + - test runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index ac848d3..dac1a20 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,9 +1,6 @@ name: CI on: pull_request: - push: - branches: - - main env: GOPATH: /go_path @@ -38,7 +35,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 From 16acb0fe80779fff0e2c836c82ccd13299103aa2 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:32:15 +0200 Subject: [PATCH 3/4] 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 8971a70b7a1bfcb3e40b161c2e8fb7afc82740a3 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:33:00 +0200 Subject: [PATCH 4/4] fix: change requires to needs on build_and_push --- .gitea/workflows/cd.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 0b9311c..3129b36 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -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