From 013f953a7ff76a5925d64a17daf0f51234e781d9 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Sat, 9 Dec 2023 22:10:04 +0100 Subject: [PATCH] Fixed actions --- .gitea/workflows/deploy_dev.yaml | 16 ++++++++++------ .gitea/workflows/deploy_prod.yaml | 28 ++++++++++------------------ .gitea/workflows/deploy_staging.yaml | 16 ++++++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml index 7f6e13e3..1466204b 100644 --- a/.gitea/workflows/deploy_dev.yaml +++ b/.gitea/workflows/deploy_dev.yaml @@ -28,9 +28,6 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - name: Set version run: | cd bot/docker @@ -39,6 +36,7 @@ jobs: - name: Prepare bot build run: | + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cd bot cpl i @@ -76,9 +74,6 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - name: Set version run: | cd bot/docker @@ -125,6 +120,15 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true + - name: Install cpl + run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + + - name: Set version + run: | + cd bot/docker + chmod +x ./set-docker-compose-image-version.sh + ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;) + - name: Deploy Stack to sh-edraft.de uses: https://github.com/kgierke/portainer-stack-deployment@v1 with: diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml index c900a7d4..09566db7 100644 --- a/.gitea/workflows/deploy_prod.yaml +++ b/.gitea/workflows/deploy_prod.yaml @@ -28,17 +28,9 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - - name: Set version - run: | - cd bot/docker - chmod +x ./set-docker-compose-image-version.sh - ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;) - - name: Prepare bot build run: | + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cd bot cpl i @@ -76,15 +68,6 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - - name: Set version - run: | - cd bot/docker - chmod +x ./set-docker-compose-image-version.sh - ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;) - - name: Setup node uses: https://github.com/actions/setup-node@v3 @@ -125,6 +108,15 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true + - name: Install cpl + run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + + - name: Set version + run: | + cd bot/docker + chmod +x ./set-docker-compose-image-version.sh + ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;) + - name: Deploy Stack to sh-edraft.de uses: https://github.com/kgierke/portainer-stack-deployment@v1 with: diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml index 4a01b239..98514415 100644 --- a/.gitea/workflows/deploy_staging.yaml +++ b/.gitea/workflows/deploy_staging.yaml @@ -28,9 +28,6 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - name: Set version run: | cd bot/docker @@ -39,6 +36,7 @@ jobs: - name: Prepare bot build run: | + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cd bot cpl i @@ -76,9 +74,6 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true - - name: Install cpl - run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli - - name: Set version run: | cd bot/docker @@ -125,6 +120,15 @@ jobs: token: ${{ secrets.CI_ACCESS_TOKEN }} submodules: true + - name: Install cpl + run: python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + + - name: Set version + run: | + cd bot/docker + chmod +x ./set-docker-compose-image-version.sh + ./set-docker-compose-image-version.sh git.sh-edraft.de/sh-edraft.de/sdb-bot:$(cd ../; cpl gv) git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;) + - name: Deploy Stack to sh-edraft.de uses: https://github.com/kgierke/portainer-stack-deployment@v1 with: