.gitea/workflows/deploy.yaml

@@ -9,28 +9,50 @@ jobs:
   build:
     runs-on: rust
     container:
-      options: --dns 172.16.255.254
+      image: xyonofcalhoun/manifold:latest
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Pre-seed known_hosts
-        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa badgey >> ~/.ssh/known_hosts
       - name: Build (Release)
         run: cargo build --release --color=always
-      - uses: cschleiden/replace-tokens@v1.2
+      - name: Archive artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: badgey
+          path: target/release/badgey
+  deploy:
+    runs-on: rust
+    container:
+      options: --dns 172.16.255.254
+    strategy:
+      matrix:
+        bot: [ BADGEY, M5_COMPUTER ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: badgey
+      - name: Seed config file
+        uses: cschleiden/replace-tokens@v1.2
         with:
           files: config/production.badgey.json
         env:
+          BOT_NICKNAME: ${{ vars[format('{0}_BOT_NICKNAME', matrix.bot) }}
+          LOG_CHANNEL_ID: ${{ vars[format('{0}_LOG_CHANNEL_ID', matrix.bot) }}
           POSTGRES_HOST: ${{ vars.POSTGRES_HOST }}
           POSTGRES_USER: ${{ vars.POSTGRES_USER }}
-          POSTGRES_DATABASE_NAME: ${{ vars.POSTGRES_DATABASE_NAME }}
+          POSTGRES_DATABASE_NAME: ${{ vars[format('{0}_POSTGRES_DATABASE_NAME', matrix.bot) }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           WEATHER_API_KEY: ${{ secrets.WEATHER_API_KEY }}
           DOGPICS_API_KEY: ${{ secrets.DOGPICS_API_KEY }}
           CATPICS_API_KEY: ${{ secrets.CATPICS_API_KEY }}
+      - name: Pre-seed known_hosts
+        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }} >> ~/.ssh/known_hosts
       - name: Seed SSH key for deploy
         run: echo "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_rsa && chmod 0600 ~/.ssh/id_rsa
       - name: Deploy
-        run: bash cicd/deploy.sh
+        run: bash cicd/deploy.sh ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot) }}

cicd/deploy.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
-ssh badgey@badgey sudo /usr/bin/systemctl stop badgey
-rsync -avP target/release/badgey badgey@badgey:/srv/badgey/
-rsync -avP config badgey@badgey:/srv/badgey/
-rsync -avP txt badgey@badgey:/srv/badgey/
-ssh badgey@badgey sudo /usr/bin/systemctl start badgey
+bot=$1
+
+ssh badgey@$bot sudo /usr/bin/systemctl stop $bot
+rsync -avP badgey badgey@$bot:/srv/$bot/
+rsync -avP config badgey@$bot:/srv/$bot/
+rsync -avP txt badgey@$bot:/srv/$bot/
+ssh badgey@$bot sudo /usr/bin/systemctl start $bot