sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

staging into master #426

Merged
edraft merged 83 commits from staging into master 2023-11-06 20:06:34 +01:00
Conversation 0 Commits 83 Files Changed 840 +4 -4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99d476df86 - Show all commits

2
.gitea/workflows/deploy_dev.yaml
View File

@ -63,7 +63,7 @@ jobs:
run: |
cd bot/docker
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv)-dev sh-edraft.de/sdb-web:$(npm run -s gv)-dev
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
- name: Deploy Stack to sh-edraft.de
uses: https://github.com/kgierke/portainer-stack-deployment@v1

2
.gitea/workflows/deploy_prod.yaml
View File

@ -62,7 +62,7 @@ jobs:
run: |
cd bot/docker
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv) sh-edraft.de/sdb-web:$(npm run -s gv)
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv) 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

2
.gitea/workflows/deploy_staging.yaml
View File

@ -63,7 +63,7 @@ jobs:
run: |
cd bot/docker
chmod +x ./set-docker-compose-image-version.sh
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cpl gv)-staging sh-edraft.de/sdb-web:$(npm run -s gv)-staging
./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
- name: Deploy Stack to sh-edraft.de
uses: https://github.com/kgierke/portainer-stack-deployment@v1

2
bot/docker

@ -1 +1 @@
Subproject commit 33fdd63ee1f79eaa297d5bf7409e8135abea011a
Subproject commit 95a4530ae594f3be66e36e2b1af9b86452d9fc3e