diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index ef195ab..30b265e 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -42,13 +42,13 @@ jobs: sed -i 's#baseurl = "https://cryptoparty.hamburg.ccc.de.de"#baseurl = "https://staging.cryptoparty.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/"#' config.toml - name: Build website (prod) - # if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'master' + if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'master' run: | hugo - # - name: Build website (staging) - # if: github.ref_name != 'master' - # run: | - # hugo --buildFuture --buildDrafts + - name: Build website (staging) + if: github.ref_name != 'master' + run: | + hugo --buildFuture --buildDrafts - name: Deploy - Prepare keys if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' @@ -57,23 +57,23 @@ jobs: chmod 400 deploykey.priv echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts - # - name: Deploy - Upload PR to staging - # if: github.event_name == 'pull_request' - # run: | - # echo "Deploying to staging.cryptoparty.hamburg.ccc.de/pr${{ github.event.pull_request.number }}" - # rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/ - # - name: Deploy - Add comment to PR with staging URL - # if: github.event_name == 'pull_request' && github.event.action == 'opened' - # run: | - # curl \ - # -X POST \ - # ${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \ - # -H "Content-Type: application/json" \ - # -H "Authorization: token $GITHUB_TOKEN" \ - # --data '{ "body": "You can view your changes at https://staging.cryptoparty.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" }' + - name: Deploy - Upload PR to staging + if: github.event_name == 'pull_request' + run: | + echo "Deploying to staging.cryptoparty.hamburg.ccc.de/pr${{ github.event.pull_request.number }}" + rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/ + - name: Deploy - Add comment to PR with staging URL + if: github.event_name == 'pull_request' && github.event.action == 'opened' + run: | + curl \ + -X POST \ + ${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \ + -H "Content-Type: application/json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + --data '{ "body": "You can view your changes at https://staging.cryptoparty.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" }' - name: Deploy - Upload to prod - # if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' + if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' run: | rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/cryptoparty-hamburg.de/