Merge pull request 'Fixed actions' (#458 ) from dev into staging

Reviewed-on: #458
Merge branch 'staging' into dev
2023-12-09 22:38:35 +01:00 · 2023-12-09 22:38:16 +01:00 · 2023-12-09 22:33:14 +01:00
2 changed files with 0 additions and 24 deletions
--- a/.gitea/workflows/deploy_dev.yaml
+++ b/.gitea/workflows/deploy_dev.yaml
@ -28,12 +28,6 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

-      - 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)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
-
      - name: Prepare bot build
        run: |
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
@ -74,12 +68,6 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

-      - 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)-dev git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
-
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3

--- a/.gitea/workflows/deploy_staging.yaml
+++ b/.gitea/workflows/deploy_staging.yaml
@ -28,12 +28,6 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

-      - 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)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
-
      - name: Prepare bot build
        run: |
          python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
@ -74,12 +68,6 @@ jobs:
          token: ${{ secrets.CI_ACCESS_TOKEN }}
          submodules: true

-      - 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)-staging git.sh-edraft.de/sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
-
      - name: Setup node
        uses: https://github.com/actions/setup-node@v3
Author	SHA1	Message	Date
Sven Heidemann	f6b2739394	Merge pull request 'Fixed actions' (#458 ) from dev into staging All checks were successful Deploy staging on push / pre-build (push) Successful in 1s Details Deploy staging on push / build-bot (push) Successful in 1m52s Details Deploy staging on push / build-web (push) Successful in 1m44s Details Deploy staging on push / deploy (push) Successful in 23s Details Reviewed-on: #458	2023-12-09 22:38:35 +01:00
Sven Heidemann	36d2605655	Merge branch 'staging' into dev All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m53s Details Deploy dev on push / build-web (push) Successful in 1m47s Details Deploy dev on push / deploy (push) Successful in 21s Details	2023-12-09 22:38:16 +01:00
Sven Heidemann	af891fa588	Fixed actions All checks were successful Deploy dev on push / pre-build (push) Successful in 1s Details Deploy dev on push / build-bot (push) Successful in 1m51s Details Deploy dev on push / build-web (push) Successful in 1m50s Details Deploy dev on push / deploy (push) Successful in 23s Details	2023-12-09 22:33:14 +01:00