From 9f363180bfb20881fc9b435083f964690f980830 Mon Sep 17 00:00:00 2001 From: Xyon Date: Sat, 12 Oct 2024 16:20:31 +0100 Subject: [PATCH] switch back to matrix deploy to deploy both bots --- .gitea/workflows/deploy.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 7caa613..9b97448 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -26,8 +26,9 @@ jobs: runs-on: rust container: options: --dns 172.16.255.254 - env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + strategy: + matrix: + bot: [ BADGEY, M5_COMPUTER ] steps: - name: Checkout uses: actions/checkout@v3 @@ -38,16 +39,17 @@ jobs: - name: Pre-seed known_hosts run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa $BOT_SERVER_HOSTNAME >> ~/.ssh/known_hosts env: - BOT_SERVER_HOSTNAME: ${{ vars[format('{0}_SERVER_HOSTNAME', 'BADGEY')] }} + BOT_SERVER_HOSTNAME: ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot)] }} - uses: cschleiden/replace-tokens@v1.2 with: files: config/production.badgey.json env: - BOT_NICKNAME: ${{ vars[format('{0}_BOT_NICKNAME', 'BADGEY')] }} - BOT_IDENTIFIER: ${{ vars[format('{0}_SERVER_HOSTNAME', 'BADGEY'] }} + BOT_NICKNAME: ${{ vars[format('{0}_BOT_NICKNAME', matrix.bot)] }} + BOT_IDENTIFIER: ${{ vars[format('{0}_SERVER_HOSTNAME', 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[format('{0}_POSTGRES_DATABASE_NAME', 'BADGEY')] }} + 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 }} @@ -55,4 +57,4 @@ jobs: - 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 ${{ vars[format('{0}_SERVER_HOSTNAME', 'BADGEY'] }} + run: bash cicd/deploy.sh ${{ vars[format('{0}_SERVER_HOSTNAME', matrix.bot)] }}