From a9003903903e204a7def5835f86716a4ce0fb67b Mon Sep 17 00:00:00 2001 From: "(Jip) Willem Wijnia" Date: Tue, 8 Oct 2024 18:11:23 +0200 Subject: [PATCH] Use the SSH credentials in the other deployments too --- .github/workflows/deploy-faf.yaml | 15 +++++++-------- .github/workflows/deploy-fafbeta.yaml | 19 +++++++++---------- .github/workflows/deploy-fafdevelop.yaml | 16 +++++++--------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.github/workflows/deploy-faf.yaml b/.github/workflows/deploy-faf.yaml index 7cccd12bfc..d059d388f4 100644 --- a/.github/workflows/deploy-faf.yaml +++ b/.github/workflows/deploy-faf.yaml @@ -20,7 +20,7 @@ name: Deploy to FAF -# Prevent simultaneous deployments across all deployment branches as +# Prevent simultaneous deployments across all deployment branches as # the server is unable to process multiple deployments at the same time. concurrency: @@ -43,8 +43,9 @@ jobs: - name: Checkout FA repository uses: actions/checkout@v4 with: - repository: FAForever/fa - ref: master + ssh-key: ${{ secrets.SSH_FAFOREVER_MACHINE_USER }} + repository: FAForever/fa + ref: master # Allows us to better understand the game version and the specific commit hash when we receive a log - name: Update version references @@ -71,16 +72,14 @@ jobs: - name: Create a commit run: | # Configure git - git config user.email "administrator@faforever.com" - git config user.name "FAForever" + git config user.email "github@faforever.com" + git config user.name "FAForever Machine User" git add . git commit -m "Post-process deployment" - # Update the deploy/faf branch, we force push here because + # Update the deploy/faf branch, we force push here because # we're not interested in fixing conflicts - name: Update deploy/faf run: | git push origin HEAD:deploy/faf --force - - diff --git a/.github/workflows/deploy-fafbeta.yaml b/.github/workflows/deploy-fafbeta.yaml index d3937cb89b..f3fbd58d5f 100644 --- a/.github/workflows/deploy-fafbeta.yaml +++ b/.github/workflows/deploy-fafbeta.yaml @@ -20,7 +20,7 @@ name: Deploy to FAF Beta Balance -# Prevent simultaneous deployments across all deployment branches as +# Prevent simultaneous deployments across all deployment branches as # the server is unable to process multiple deployments at the same time. concurrency: @@ -30,7 +30,7 @@ concurrency: on: workflow_dispatch: schedule: - - cron: '0 21 1 * *' + - cron: "0 21 1 * *" jobs: test: @@ -44,8 +44,9 @@ jobs: - name: Checkout FA repository uses: actions/checkout@v4 with: - repository: FAForever/fa - ref: develop + ssh-key: ${{ secrets.SSH_FAFOREVER_MACHINE_USER }} + repository: FAForever/fa + ref: develop # Allows us to better understand the game version and the specific commit hash when we receive a log - name: Update version references @@ -58,7 +59,7 @@ jobs: cat lua/version.lua # Disable debugging statements - # + # # You can overwrite these adjustments by setting up a `Debug` folder - name: Overwrite debug references run: | @@ -71,16 +72,14 @@ jobs: - name: Create a commit run: | # Configure git - git config user.email "administrator@faforever.com" - git config user.name "FAForever" + git config user.email "github@faforever.com" + git config user.name "FAForever Machine User" git add . git commit -m "Post-process deployment" - # Update the deploy/fafbeta branch, we force push here because + # Update the deploy/fafbeta branch, we force push here because # we're not interested in fixing conflicts - name: Update deploy/fafbeta run: | git push origin HEAD:deploy/fafbeta --force - - diff --git a/.github/workflows/deploy-fafdevelop.yaml b/.github/workflows/deploy-fafdevelop.yaml index 4ce18f9201..ef22002b5f 100644 --- a/.github/workflows/deploy-fafdevelop.yaml +++ b/.github/workflows/deploy-fafdevelop.yaml @@ -20,7 +20,7 @@ name: Deploy to FAF Develop -# Prevent simultaneous deployments across all deployment branches as +# Prevent simultaneous deployments across all deployment branches as # the server is unable to process multiple deployments at the same time. concurrency: @@ -30,7 +30,7 @@ concurrency: on: workflow_dispatch: schedule: - - cron: '0 21 * * 4' + - cron: "0 21 * * 4" jobs: test: @@ -44,9 +44,9 @@ jobs: - name: Checkout FA repository uses: actions/checkout@v4 with: - ssh-key: ${{ secrets.SSH_FAFOREVER_MACHINE_USER }} - repository: FAForever/fa - ref: develop + ssh-key: ${{ secrets.SSH_FAFOREVER_MACHINE_USER }} + repository: FAForever/fa + ref: develop # Allows us to better understand the game version and the specific commit hash when we receive a log - name: Update version references @@ -59,7 +59,7 @@ jobs: cat lua/version.lua # Disable debugging statements - # + # # You can overwrite these adjustments by setting up a `Debug` folder - name: Overwrite debug references run: | @@ -78,10 +78,8 @@ jobs: git add . git commit -m "Post-process deployment" - # Update the deploy/fafdevelop branch, we force push here because + # Update the deploy/fafdevelop branch, we force push here because # we're not interested in fixing conflicts - name: Update deploy/fafdevelop run: | git push origin HEAD:deploy/fafdevelop --force - -