Update workflows (#95)

* Fix logging

* Update dependency Discord.Net to v3.12.0 (#92)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Fix logging

* Fix merge conflict

* Update workflows

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/docker-deploy-develop.yml

@@ -12,6 +12,7 @@ jobs:
 
   deploy:
     name: Deploy Docker image
+    environment: staging
     needs: [ci]
     runs-on: ubuntu-latest
     steps:
@@ -22,14 +23,14 @@ jobs:
           method: 'POST'
           bearerToken: ${{ secrets.TESTBOT_WEBHOOK_DEPLOY_KEY }}
           customHeaders: '{"Content-Type": "application/json" }'
-          data: '{"toEveryone":false,"embed":{"color":{"r":0,"g":1,"b":0},"description":"MacroBot updating to ${{ github.sha }}.","fields":[{"name":"Branch","value":"Develop","inline":false},{"name":"SHA","value":"${{ github.sha }}","inline":false}]}}'
+          data: '{"toEveryone":false,"embed":{"color":{"r":0,"g":1,"b":0},"description":"MacroBot is updating to ${{ github.sha }}.","fields":[{"name":"Branch","value":"Develop","inline":false},{"name":"SHA","value":"${{ github.sha }}","inline":false}]}}'
 
       - name: Updating the image on the server
-        uses: appleboy/[email protected]
+        uses: Macro-Deck-App/Actions/deploy@main
         with:
-          host: ${{ secrets.TEST_SSH_HOST }}
-          username: ${{ secrets.GITHUBWORKFLOWS_USER }}
-          key: ${{ secrets.TEST_SSH_PRIVATE_KEY }}
-          script: |
-            cd "scripts/macro-bot/"
-            ./update_develop.sh ${{ github.sha }}
+          host: ${{ secrets.TEST_DEPLOY_HOST }}
+          user: ${{ secrets.TEST_DEPLOY_USER }}
+          key: ${{ secrets.TEST_DEPLOY_KEY }}
+          known-hosts: ${{ secrets.TEST_DEPLOY_KNOWN_HOSTS }}
+          sha: ${{ github.sha }}
+          service: macro-bot

.github/workflows/docker-deploy-production.yml

@@ -11,25 +11,25 @@ jobs:
 
   deploy:
     name: Build and deploy Docker image
+    environment: production
     needs: [ci]
     runs-on: ubuntu-latest
     steps:
-      - name: Updating the image on the server
-        uses: appleboy/[email protected]
-        with:
-          host: ${{ secrets.DOCKER_HOST }}
-          username: ${{ secrets.GITHUBWORKFLOWS_USER }}
-          password: ${{ secrets.GITHUBWORKFLOWS_USER_PASSWORD }}
-          port: ${{ secrets.DOCKER_HOST_PORT }}
-          script: |
-            cd "scripts/macro-bot/"
-            ./update_production.sh ${{ github.sha }}
-
       - uses: fjogeleit/http-request-action@v1
         continue-on-error: true
         with:
           url: 'https://bot.api.macro-deck.app/webhook/deploy'
           method: 'POST'
           bearerToken: ${{ secrets.BOT_WEBHOOK_DEPLOY_KEY }}
           customHeaders: '{"Content-Type": "application/json" }'
-          data: '{"toEveryone":false,"embed":{"color":{"r":0,"g":1,"b":0},"description":"MacroBot is now on ${{ github.sha }}.","fields":[{"name":"Branch","value":"Develop","inline":false},{"name":"SHA","value":"${{ github.sha }}","inline":false}]}}'
+          data: '{"toEveryone":false,"embed":{"color":{"r":0,"g":1,"b":0},"description":"MacroBot is updating to ${{ github.sha }}.","fields":[{"name":"Branch","value":"Develop","inline":false},{"name":"SHA","value":"${{ github.sha }}","inline":false}]}}'
+
+      - name: Updating the image on the server
+        uses: Macro-Deck-App/Actions/deploy@main
+        with:
+          host: ${{ secrets.LIVE_DEPLOY_HOST }}
+          user: ${{ secrets.LIVE_DEPLOY_USER }}
+          key: ${{ secrets.LIVE_DEPLOY_KEY }}
+          known-hosts: ${{ secrets.LIVE_DEPLOY_KNOWN_HOSTS }}
+          sha: ${{ github.sha }}
+          service: macro-bot

src/MacroBot/StartupConfig/LoggingConfiguration.cs

@@ -16,8 +16,8 @@ public static IHostBuilder ConfigureSerilog(this IHostBuilder hostBuilder)
             if (MacroBotEnvironment.IsStagingOrProduction)
             {
                 configuration
-                    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Warning)
-                    .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Warning)
+                    .MinimumLevel.Override("Microsoft.EntityFrameworkCore", LogEventLevel.Information)
+                    .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Information)
                     .WriteTo.Logger(lc =>
                         lc.Filter.ByIncludingOnly(Matching.FromSource("MacroBot")).WriteTo.DiscordSink(services))
                     .WriteTo.Logger(lc =>