From e45d2c15ca2b2cf7af35ae0277dcff3ca4190039 Mon Sep 17 00:00:00 2001 From: Timo Behrendt Date: Sun, 11 Aug 2024 12:05:09 +0200 Subject: [PATCH] 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: