Compare commits

..

No commits in common. "6bfb0ddbf9eeb91e06575505f45bb1a92da80097" and "d25305be4a445c7eaf10dec3dba2f437c99958f8" have entirely different histories.

5 changed files with 28 additions and 10 deletions

View File

@ -8,8 +8,15 @@ on:
jobs: jobs:
on-push-deploy_sh-edraft: on-push-deploy_sh-edraft:
runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
container: sh-edraft.de/act-runner:latest container: catthehacker/ubuntu:act-latest
steps: 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 - name: Setup docker
uses: https://github.com/papodaca/install-docker-action@main uses: https://github.com/papodaca/install-docker-action@main
- run: docker -v - run: docker -v
@ -23,7 +30,7 @@ jobs:
- name: Prepare bot build - name: Prepare bot build
run: | run: |
cd bot cd bot
python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
cpl i cpl i
- name: Setup node - name: Setup node

View File

@ -8,8 +8,15 @@ on:
jobs: jobs:
on-push-deploy_sh-edraft: on-push-deploy_sh-edraft:
runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
container: sh-edraft.de/act-runner:latest container: catthehacker/ubuntu:act-latest
steps: 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 - name: Setup docker
uses: https://github.com/papodaca/install-docker-action@main uses: https://github.com/papodaca/install-docker-action@main
- run: docker -v - run: docker -v
@ -23,7 +30,7 @@ jobs:
- name: Prepare bot build - name: Prepare bot build
run: | run: |
cd bot cd bot
python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
cpl i cpl i
- name: Setup node - name: Setup node

View File

@ -8,8 +8,15 @@ on:
jobs: jobs:
on-push-deploy_sh-edraft: on-push-deploy_sh-edraft:
runs-on: [ dobby.sh-edraft.de, ubuntu-latest ] runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
container: sh-edraft.de/act-runner:latest container: catthehacker/ubuntu:act-latest
steps: 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 - name: Setup docker
uses: https://github.com/papodaca/install-docker-action@main uses: https://github.com/papodaca/install-docker-action@main
- run: docker -v - run: docker -v
@ -23,7 +30,7 @@ jobs:
- name: Prepare bot build - name: Prepare bot build
run: | run: |
cd bot cd bot
python3.10 -m pip install --extra-index-url https://pip.sh-edraft.de cpl-cli pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
cpl i cpl i
- name: Setup node - name: Setup node

@ -1 +1 @@
Subproject commit 9c0dc595348f9ccd58409cc21171456d9ba85758 Subproject commit 8063944d871d88a1400e45d3fdac29ee69485eb5

View File

@ -398,9 +398,6 @@ class DataIntegrityService:
if user is None: if user is None:
continue 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._user_joins_vc.delete_user_joined_voice_channel_by_user_id(user.id)
self._users.delete_user(user) self._users.delete_user(user)
self._db_context.save_changes() self._db_context.save_changes()