From 590479eee2ce7196a38a6a784c623dfcfc8e9160 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 6 Nov 2023 20:52:49 +0100 Subject: [PATCH 1/3] Set migration only on prod --- bot/docker | 2 +- bot/src/bot_core/service/data_integrity_service.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bot/docker b/bot/docker index 8063944d..9c0dc595 160000 --- a/bot/docker +++ b/bot/docker @@ -1 +1 @@ -Subproject commit 8063944d871d88a1400e45d3fdac29ee69485eb5 +Subproject commit 9c0dc595348f9ccd58409cc21171456d9ba85758 diff --git a/bot/src/bot_core/service/data_integrity_service.py b/bot/src/bot_core/service/data_integrity_service.py index cb3c0f6f..83f53551 100644 --- a/bot/src/bot_core/service/data_integrity_service.py +++ b/bot/src/bot_core/service/data_integrity_service.py @@ -398,6 +398,9 @@ class DataIntegrityService: if user is None: continue + for join in self._user_joins.get_user_joined_servers_by_user_id(user.id): + self._user_joins.delete_user_joined_server(join) + self._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id) self._users.delete_user(user) self._db_context.save_changes() -- 2.45.2 From e6f98def6a68336c11b3eec752afda49e1db0064 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 6 Nov 2023 21:19:21 +0100 Subject: [PATCH 2/3] Possibly fixed rate limit in actions --- .gitea/workflows/deploy_dev.yaml | 9 +-------- .gitea/workflows/deploy_prod.yaml | 9 +-------- .gitea/workflows/deploy_staging.yaml | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml index 9e7850ab..f680ee6d 100644 --- a/.gitea/workflows/deploy_dev.yaml +++ b/.gitea/workflows/deploy_dev.yaml @@ -8,15 +8,8 @@ on: jobs: on-push-deploy_sh-edraft: runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] - container: catthehacker/ubuntu:act-latest + container: sh-edraft.de/act-runner:latest steps: - - name: Setup Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10.12" - token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }} - - run: python -v - - name: Setup docker uses: https://github.com/papodaca/install-docker-action@main - run: docker -v diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml index d205e167..61a73e24 100644 --- a/.gitea/workflows/deploy_prod.yaml +++ b/.gitea/workflows/deploy_prod.yaml @@ -8,15 +8,8 @@ on: jobs: on-push-deploy_sh-edraft: runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] - container: catthehacker/ubuntu:act-latest + container: sh-edraft.de/act-runner:latest steps: - - name: Setup Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10.12" - token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }} - - run: python -v - - name: Setup docker uses: https://github.com/papodaca/install-docker-action@main - run: docker -v diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml index 7eabe8cd..ef939fa5 100644 --- a/.gitea/workflows/deploy_staging.yaml +++ b/.gitea/workflows/deploy_staging.yaml @@ -8,15 +8,8 @@ on: jobs: on-push-deploy_sh-edraft: runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] - container: catthehacker/ubuntu:act-latest + container: sh-edraft.de/act-runner:latest steps: - - name: Setup Python 3.10 - uses: actions/setup-python@v3 - with: - python-version: "3.10.12" - token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }} - - run: python -v - - name: Setup docker uses: https://github.com/papodaca/install-docker-action@main - run: docker -v -- 2.45.2 From e1b76fa62829d01a4533984f6f9afa8d30d4b316 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Mon, 6 Nov 2023 21:22:58 +0100 Subject: [PATCH 3/3] Possibly fixed rate limit in actions --- .gitea/workflows/deploy_dev.yaml | 2 +- .gitea/workflows/deploy_prod.yaml | 2 +- .gitea/workflows/deploy_staging.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy_dev.yaml b/.gitea/workflows/deploy_dev.yaml index f680ee6d..97b6c4d1 100644 --- a/.gitea/workflows/deploy_dev.yaml +++ b/.gitea/workflows/deploy_dev.yaml @@ -23,7 +23,7 @@ jobs: - name: Prepare bot build run: | cd bot - pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cpl i - name: Setup node diff --git a/.gitea/workflows/deploy_prod.yaml b/.gitea/workflows/deploy_prod.yaml index 61a73e24..1a4fb6dd 100644 --- a/.gitea/workflows/deploy_prod.yaml +++ b/.gitea/workflows/deploy_prod.yaml @@ -23,7 +23,7 @@ jobs: - name: Prepare bot build run: | cd bot - pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cpl i - name: Setup node diff --git a/.gitea/workflows/deploy_staging.yaml b/.gitea/workflows/deploy_staging.yaml index ef939fa5..f8bbd17a 100644 --- a/.gitea/workflows/deploy_staging.yaml +++ b/.gitea/workflows/deploy_staging.yaml @@ -23,7 +23,7 @@ jobs: - name: Prepare bot build run: | cd bot - pip install --extra-index-url https://pip.sh-edraft.de cpl-cli + python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli cpl i - name: Setup node -- 2.45.2