Merge branch 'develop' into 'master'

Develop

See merge request discord-bots/chaosbot!17

.gitlab-ci.yml

@@ -43,9 +43,6 @@ build:
   - hawkeye
   script:
     - 'dotnet build --no-restore'
-  artifacts:
-    paths:
-      - bin/
 
 tests:
   stage: test
@@ -71,14 +68,14 @@ release:
       - master
   dependencies:
     - tests
-  artifacts:
-    paths:
-      - publish/
   tags:
   - docker
   - hawkeye
   script:
-    - 'dotnet publish -c Release -o ../publish ChaosBot/ChaosBot.csproj'
+    - 'dotnet publish -c Release -r linux-musl-x64 -o ../build --self-contained true'
+  artifacts:
+    paths:
+      - build/*
       
 deploy:
   stage: deploy
@@ -93,8 +90,9 @@ deploy:
   dependencies:
     - release
   script:
-    - 'apk add lftp openssh-client curl'
+    - 'apk add lftp openssh-client curl jq'
     - 'mkdir ~/.ssh'
-    - 'ssh-keyscan -p 2022 panel.chaoticlogic.us >> ~/.ssh/known_hosts'
+    - 'ssh-keyscan -p 2303 panel.chaoticlogic.us >> ~/.ssh/known_hosts'
-    - 'lftp sftp://$SFTP_USER:$SFTP_PASS@$SFTP_HOST -e "mirror -X .* -X .*/ -X *.db -X appsettings.json --reverse --verbose --delete --parallel=8 ../publish/ ./; bye"'
+    - 'echo "LFTP needs to be fixed"'
-    - 'curl -H "Authorization: Bearer $API_TOKEN" -H "Content-Type: application/json" -H "Accept: Application/vnd.pterodactyl.v1+json" "$API_URI/client/servers/$API_CONTAINER/power" -X POST -d "{ \"signal\": \"restart\" }"'
+    - 'lftp sftp://$SFTP_USER:$SFTP_PASS@$SFTP_HOST -e "mirror -X .* -X .*/ -X *.db -X appsettings.json --reverse --verbose --delete --parallel=8 build/ ./; bye"'
+  #  - 'curl -X POST $API_URI/api/endpoints/$ENDPOINT_URI/docker/containers/$CONTAINER_ID/restart -H "Authorization: Bearer `curl -X POST $API_URI/api/auth -H "Content-Type: application/json" -d "{\"Username\": \"$API_USER\", \"Password\": \"$API_PASS\"}"" | jq -r ".jwt"`"'