.drone.yml

@@ -0,0 +1,77 @@
+kind: pipeline
+name: deploy
+steps:
+- name: docker
+  image: plugins/docker
+  settings:
+    registry: git.ar21.de
+    username:
+      from_secret: REGISTRY_USER
+    password:
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
+    tags: latest
+  when:
+    branch:
+      - master
+- name: docker-build
+  image: plugins/docker
+  settings:
+    registry: git.ar21.de
+    username:
+      from_secret: REGISTRY_USER
+    password:
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
+    tags: latest
+    dry_run: true
+  when:
+    branch:
+      exclude:
+        - master
+- name: dev docker
+  image: plugins/docker
+  settings:
+    registry: git.ar21.de
+    username:
+      from_secret: REGISTRY_USER
+    password:
+      from_secret: REGISTRY_PASS
+    repo: git.ar21.de/secondhemd/shbot
+    tags: dev
+  when:
+    branch:
+      - dev
+- name: deploy
+  image: appleboy/drone-ssh
+  settings:
+    host:
+      - s.ar21.de
+    username: root
+    key:
+      from_secret: DEPLOY_SSH_KEY
+    port: 22
+    command_timeout: 2m
+    script:
+      - cd ~/compose/shbot && docker compose pull shbot && docker compose up -d shbot
+  when:
+    branch:
+      - master
+- name: deploy dev
+  image: appleboy/drone-ssh
+  settings:
+    host:
+      - s.ar21.de
+    username: root
+    key:
+      from_secret: DEPLOY_SSH_KEY
+    port: 22
+    command_timeout: 2m
+    script:
+      - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev
+  when:
+    branch:
+      - dev
+when:
+  event:
+    - push

.woodpecker/.build.yaml

@@ -1,42 +0,0 @@
-steps:
-- name: docker
-  image: woodpeckerci/plugin-docker-buildx
-  settings:
-    registry: git.ar21.de
-    username:
-      from_secret: REGISTRY_USER
-    password:
-      from_secret: REGISTRY_PASS
-    repo: git.ar21.de/secondhemd/shbot
-    tags: latest
-  when:
-    - branch: master
-      event: [push, manual]
-- name: docker-build
-  image: woodpeckerci/plugin-docker-buildx
-  settings:
-    registry: git.ar21.de
-    username:
-      from_secret: REGISTRY_USER
-    password:
-      from_secret: REGISTRY_PASS
-    repo: git.ar21.de/secondhemd/shbot
-    tags: latest
-    dry_run: true
-  when:
-    - branch:
-        exclude: [master, dev]
-      event: [push, manual]
-- name: dev docker
-  image: woodpeckerci/plugin-docker-buildx
-  settings:
-    registry: git.ar21.de
-    username:
-      from_secret: REGISTRY_USER
-    password:
-      from_secret: REGISTRY_PASS
-    repo: git.ar21.de/secondhemd/shbot
-    tags: dev
-  when:
-    - branch: dev
-      event: [push, manual]

.woodpecker/.deploy.yaml

@@ -1,34 +0,0 @@
-skip_clone: true
-steps:
-- name: deploy
-  image: appleboy/drone-ssh
-  settings:
-    host:
-      - s.ar21.de
-    username: root
-    key:
-      from_secret: DEPLOY_SSH_KEY
-    port: 22
-    command_timeout: 2m
-    script:
-      - cd ~/compose/shbot && docker compose pull shbot && docker compose up -d shbot
-  when:
-    - branch: master
-      event: [push, manual]
-- name: deploy dev
-  image: appleboy/drone-ssh
-  settings:
-    host:
-      - s.ar21.de
-    username: root
-    key:
-      from_secret: DEPLOY_SSH_KEY
-    port: 22
-    command_timeout: 2m
-    script:
-      - cd /root && docker compose -f shbot-dev.yaml pull shbot-dev && docker compose -f shbot-dev.yaml up -d shbot-dev
-  when:
-    - branch: dev
-      event: [push, manual]
-depends_on:
-  - build

requirements.txt

@@ -1 +1 @@
-py-cord==2.6.1
+py-cord==2.6.0

survey.py

@@ -21,9 +21,9 @@ def mid(s, offset, amount):
     return s[offset:offset+amount]
 
 token = os.environ['TOKEN']
-survey_channel = int(os.environ['SURVEY_CHANNEL'])
+survey_channel = os.environ['SURVEY_CHANNEL']
-mention_id = int(os.environ['MENTION_ID'])
+mention_id = os.environ['MENTION_ID']
-guild_id = int(os.environ['GUILD_ID'])
+guild_id = os.environ['GUILD_ID']
 runtime = 48
 
 bot = discord.Bot(description=None)