.gitea/workflows/deploy_dev.yaml

@@ -42,27 +42,19 @@ jobs:
           npm i
 
       - name: Shutdown stack
-        run: docker stack rm sdb_dev
+        run: docker stack rm sdb_staging
 
       - name: Build docker bot
         run: |
           cd bot
           docker image prune -f
-          cpl build
+          cpl docker-build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-dev .
 
       - name: Build docker web
         run: |
           cd web
           docker image prune -f
-          cp src/favicon.dev.ico src/favicon.ico
+          npm run docker-build
-          ng build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
-
-      - name: Set version
-        run: |
-          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
 
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1
@@ -71,6 +63,6 @@ jobs:
           portainer-username: "gitea_job"
           portainer-password: "${{ secrets.docker_job }}"
           portainer-endpoint: 2
-          name: sdb_dev
+          name: sdb_staging
-          file: bot/docker/docker-compose.dev.yml
+          file: bot/docker/docker-compose.staging.yml
           variables: '{}'

.gitea/workflows/deploy_prod.yaml

@@ -48,20 +48,13 @@ jobs:
         run: |
           cd bot
           docker image prune -f
-          cpl build
+          cpl docker-build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .
 
       - name: Build docker web
         run: |
           cd web
           docker image prune -f
-          ng build
+          npm run docker-build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
-
-      - name: Set version
-        run: |
-          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)
 
       - name: Deploy Stack to sh-edraft.de
         uses: https://github.com/kgierke/portainer-stack-deployment@v1

.gitea/workflows/deploy_staging.yaml

@@ -1,76 +0,0 @@
-name: Deploy staging on push
-run-name: Deploy staging on push
-on:
-  push:
-    branches:
-      - staging
-
-jobs:
-  on-push-deploy_sh-edraft:
-    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
-    container: catthehacker/ubuntu:act-latest
-    steps:
-      - name: Setup Python 3.10
-        uses: actions/setup-python@v3
-        with:
-          python-version: "3.10.12"
-      - run: python -v
-
-      - name: Setup docker
-        uses: https://github.com/papodaca/install-docker-action@main
-      - run: docker -v
-
-      - name: Clone Repository
-        uses: https://github.com/actions/checkout@v3
-        with:
-          token: ${{ secrets.CI_ACCESS_TOKEN }}
-          submodules: true
-
-      - name: Prepare bot build
-        run: |
-          cd bot
-          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
-          cpl i
-
-      - name: Setup node
-        uses: https://github.com/actions/setup-node@v3
-
-      - name: Prepare web build
-        run: |
-          cd web
-          npm install -g ts-node
-          npm i
-
-      - name: Shutdown stack
-        run: docker stack rm sdb_staging
-
-      - name: Build docker bot
-        run: |
-          cd bot
-          docker image prune -f
-          cpl build
-          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-staging .
-
-      - name: Build docker web
-        run: |
-          cd web
-          docker image prune -f
-          cp src/favicon.staging.ico src/favicon.ico
-          ng build
-          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
-
-      - name: Set version
-        run: |
-          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
-
-      - name: Deploy Stack to sh-edraft.de
-        uses: https://github.com/kgierke/portainer-stack-deployment@v1
-        with:
-          portainer-url: "https://docker.sh-edraft.de"
-          portainer-username: "gitea_job"
-          portainer-password: "${{ secrets.docker_job }}"
-          portainer-endpoint: 2
-          name: sdb_staging
-          file: bot/docker/docker-compose.staging.yml
-          variables: '{}'

bot/docker

@@ -1 +1 @@
-Subproject commit 1812383022e18994eddacdc57aac5931b5185066
+Subproject commit 91461d3ce30d3c61c24a143fadd975a2dddb593a

bot/src/bot/config

@@ -1 +1 @@
-Subproject commit 954fd9bb341ff9ad66ffc9e293cbcde6ecb71326
+Subproject commit 1356f73f4085ddd2b90b4dc91498d0d1a6a33e0d

bot/src/bot_api/config

@@ -1 +1 @@
-Subproject commit f51429090df0bac7c93622e8fb3eac9dd1b9a5e7
+Subproject commit 1ccf0c1e3f4b71c2c8e5d559a50785997eb5ae26

bot/src/bot_graphql/graphql/scheduledEvent.gql

@@ -1,50 +0,0 @@
-type ShortRoleName implements TableWithHistoryQuery {
-    id: ID
-    shortName: String
-    roleId: String
-    roleName: String
-    position: String
-
-    server: Server
-
-    createdAt: String
-    modifiedAt: String
-
-    history: [ShortRoleNameHistory]
-}
-
-type ShortRoleNameHistory implements HistoryTableQuery {
-    id: ID
-    shortName: String
-    roleId: String
-    position: String
-
-    server: ID
-
-    deleted: Boolean
-    dateFrom: String
-    dateTo: String
-}
-
-input ShortRoleNameFilter {
-    id: ID
-    shortName: String
-    roleId: String
-    roleName: String
-    position: String
-}
-
-type ShortRoleNameMutation {
-    createShortRoleName(input: ShortRoleNameInput!): ShortRoleName
-    updateShortRoleName(input: ShortRoleNameInput!): ShortRoleName
-    deleteShortRoleName(id: ID): ShortRoleName
-}
-
-input ShortRoleNameInput {
-    id: ID
-    shortName: String
-    roleId: String
-    roleName: String
-    position: String
-    serverId: ID
-}

bot/src/modules/special_offers/steam_offer_watcher.py

@@ -184,7 +184,7 @@ class SteamOfferWatcher(TaskABC):
         self._logger.trace(__name__, "Finished watching")
         return offers_for_notifications
 
-    @tasks.loop(hours=1)
+    @tasks.loop(time=datetime.time(hour=16, minute=30))
     async def watch(self):
         self._logger.info(__name__, "Watching steam special offers")
         try:

web/package.json

@@ -10,7 +10,6 @@
         "build": "ng build",
         "watch": "ng build --watch --configuration development",
         "test": "ng test",
-        "gv": "echo $npm_package_version",
         "predocker-build": "npm run update-version",
         "docker-build": "export VERSION=$npm_package_version; ng build; docker build -t sh-edraft.de/sdb-web:$VERSION .",
         "docker-build-dev": "export VERSION=$npm_package_version; ng build --configuration development; docker build -t sh-edraft.de/sdb-web:$VERSION .",