diff --git a/.forgejo/workflows/cleanup.yaml b/.forgejo/workflows/cleanup.yaml index bb233c6..5d60035 100644 --- a/.forgejo/workflows/cleanup.yaml +++ b/.forgejo/workflows/cleanup.yaml @@ -18,6 +18,7 @@ jobs: echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv chmod 400 deploykey.priv echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts + - name: Staging Deployment - Remove PR from staging run: | ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' cryptoparty-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.cryptoparty-hamburg.de/pr${{ github.event.pull_request.number }}/" diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 473cd8b..ee681fd 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -1,7 +1,7 @@ on: push: branches: - - main + - master pull_request: env: @@ -32,21 +32,18 @@ jobs: fetch-depth: 0 # pull full history for page lastmod by git commit date submodules: recursive - - name: Patch baseURL (for now) - run: | - sed -i 's#baseurl = "https://cryptoparty-hamburg.de"#baseurl = "https://cryptoparty.hamburg.ccc.de"#' config.toml - - - name: Patch baseURL (staging only) - if: github.ref_name != 'main' - run: | - 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: Patch baseURL (staging only) + # if: github.ref_name != 'master' + # run: | + # sed -i 's#baseurl = "https://cryptoparty-hamburg.de"#baseurl = "https://staging.cryptoparty-hamburg.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' run: | hugo + # - name: Build website (staging) - # if: github.ref_name != 'main' + # if: github.ref_name != 'master' # run: | # hugo --buildFuture --buildDrafts @@ -60,7 +57,7 @@ jobs: # - 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 }}" + # echo "Deploying to staging.cryptoparty-hamburg.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' @@ -70,10 +67,10 @@ jobs: # ${{ 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 }}/" }' + # --data '{ "body": "You can view your changes at https://staging.cryptoparty-hamburg.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 == 'master' 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/