From 0fcc94d81b9b47c0fc6d0942b8c6b0eb31e27dab Mon Sep 17 00:00:00 2001 From: emmatveev Date: Fri, 11 Oct 2024 06:48:44 +0300 Subject: [PATCH 1/2] fix --- .gitea/workflows/build-and-push.yaml | 24 ----------- .gitea/workflows/deploy-dev.yaml | 59 ++++++++++++++++++---------- .gitea/workflows/deploy-prod.yaml | 59 ++++++++++++++++++---------- 3 files changed, 78 insertions(+), 64 deletions(-) delete mode 100644 .gitea/workflows/build-and-push.yaml diff --git a/.gitea/workflows/build-and-push.yaml b/.gitea/workflows/build-and-push.yaml deleted file mode 100644 index 63868f6..0000000 --- a/.gitea/workflows/build-and-push.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build and push - -on: - workflow_run: - workflows: [Deploy Dev, Deploy Prod] - -jobs: - build: - name: Build - runs-on: [dev] - steps: - - name: login - run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} - - name: checkout - uses: actions/checkout@v4 - - name: build - run: docker build -t mathwave/sprint-repo:pizda-bot . - push: - name: Push - runs-on: [dev] - needs: build - steps: - - name: push - run: docker push mathwave/sprint-repo:pizda-bot diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index 7887e8f..f6bc7a8 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -1,25 +1,44 @@ name: Deploy Dev on: - pull_request: - branches: - - dev - types: [closed] + pull_request: + branches: + - dev + types: [closed] jobs: - deploy-dev: - name: Deploy dev - runs-on: [dev] - steps: - - name: login - run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} - - name: checkout - uses: actions/checkout@v4 - with: - ref: dev - - name: deploy - env: - TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }} - MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} - PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} - run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot + build: + name: Build + runs-on: [ dev ] + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: dev + - name: build + run: docker build -t mathwave/sprint-repo:pizda-bot . + push: + name: Push + runs-on: [ dev ] + needs: build + steps: + - name: push + run: docker push mathwave/sprint-repo:pizda-bot + deploy-dev: + name: Deploy dev + runs-on: [dev] + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: dev + - name: deploy + env: + TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_DEV }} + MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_DEV }} + PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} + run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-dev.yaml pizda-bot diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 05f1323..9525032 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -1,25 +1,44 @@ name: Deploy Prod on: - pull_request: - branches: - - prod - types: [closed] + pull_request: + branches: + - prod + types: [closed] jobs: - deploy-prod: - name: Deploy prod - runs-on: [prod] - steps: - - name: login - run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} - - name: checkout - uses: actions/checkout@v4 - with: - ref: prod - - name: deploy - env: - TELEGRAM_TOKEN_PROD: ${{ secrets.TELEGRAM_TOKEN_PROD}} - MONGO_PASSWORD_PROD: ${{ secrets.MONGO_PASSWORD_PROD }} - PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} - run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot + build: + name: Build + runs-on: [ dev ] + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: prod + - name: build + run: docker build -t mathwave/sprint-repo:pizda-bot . + push: + name: Push + runs-on: [ dev ] + needs: build + steps: + - name: push + run: docker push mathwave/sprint-repo:pizda-bot + deploy-prod: + name: Deploy prod + runs-on: [prod] + steps: + - name: login + run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} + - name: checkout + uses: actions/checkout@v4 + with: + ref: prod + - name: deploy + env: + TELEGRAM_TOKEN_DEV: ${{ secrets.TELEGRAM_TOKEN_PROD }} + MONGO_PASSWORD_DEV: ${{ secrets.MONGO_PASSWORD_PROD }} + PLATFORM_SECURITY_TOKEN: ${{ secrets.PLATFORM_SECURITY_TOKEN }} + run: docker stack deploy --with-registry-auth -c ./.deploy/deploy-prod.yaml pizda-bot From 41e1629892315aaefbf17dbaa1415684b25a877d Mon Sep 17 00:00:00 2001 From: emmatveev Date: Fri, 11 Oct 2024 06:50:32 +0300 Subject: [PATCH 2/2] fix --- .gitea/workflows/deploy-dev.yaml | 1 + .gitea/workflows/deploy-prod.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitea/workflows/deploy-dev.yaml b/.gitea/workflows/deploy-dev.yaml index f6bc7a8..6f5dd31 100644 --- a/.gitea/workflows/deploy-dev.yaml +++ b/.gitea/workflows/deploy-dev.yaml @@ -29,6 +29,7 @@ jobs: deploy-dev: name: Deploy dev runs-on: [dev] + needs: push steps: - name: login run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }} diff --git a/.gitea/workflows/deploy-prod.yaml b/.gitea/workflows/deploy-prod.yaml index 9525032..611ab74 100644 --- a/.gitea/workflows/deploy-prod.yaml +++ b/.gitea/workflows/deploy-prod.yaml @@ -29,6 +29,7 @@ jobs: deploy-prod: name: Deploy prod runs-on: [prod] + needs: push steps: - name: login run: docker login -u mathwave -p ${{ secrets.DOCKERHUB_PASSWORD }}