From 7876d26d6fe59d9efcf514802a3bfd982136a147 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Fri, 9 May 2025 07:03:01 +0000 Subject: [PATCH 1/5] Explicitly use the pr-commenter-action from GH Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index dc24ffa..b70b445 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -77,7 +77,7 @@ jobs: - name: Comment pull request id: comment_pull_request if: ${{ always() && gitea.event_name == 'pull_request' }} - uses: exercism/pr-commenter-action@v1.5.1 + uses: https://github.com/exercism/pr-commenter-action@v1.5.1 with: template-variables: | { From 2457855851f2a11a4bd3d02560ca1ed7da517a89 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Fri, 9 May 2025 07:10:59 +0000 Subject: [PATCH 2/5] Override the default git server url to use Forgejo Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index b70b445..c56788e 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -18,6 +18,7 @@ jobs: - name: Check out repository id: checkout uses: actions/checkout@v4 + github-server-url: 'https://forge.87b59b92.nip.io/' - name: Change file ownership id: file_ownership run: | From dcf1fbd4f60d74fd2f5d95f028f93787319ac19b Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Fri, 9 May 2025 09:23:34 +0000 Subject: [PATCH 3/5] Use the correct username to deploy on prod Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index c56788e..fbe9937 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -8,8 +8,8 @@ on: env: _UID: 1000 _GID: 1000 - WEB_DOMAIN: lafs.eval.latfa.net - WEB_USER: www + WEB_DOMAIN: 87b59b92.nip.io + WEB_USER: bot-www WEB_DIR: /var/www jobs: jekyll: From 52382d65e3df04bca96ce23dedb25ce309bb3586 Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Fri, 9 May 2025 09:41:11 +0000 Subject: [PATCH 4/5] Use the correct virtual hosts for prod Signed-off-by: Benoit Donneaux --- .gitea/workflows/jekyll.yaml | 18 ++++++++++-------- .gitea/workflows/jekyll_cleanup.yml | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/jekyll.yaml b/.gitea/workflows/jekyll.yaml index fbe9937..b7e87f0 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.gitea/workflows/jekyll.yaml @@ -8,7 +8,8 @@ on: env: _UID: 1000 _GID: 1000 - WEB_DOMAIN: 87b59b92.nip.io + WEB_DOMAIN: tahoe-lafs.org + WEB_HOST: webforge.of.tahoe-lafs.org WEB_USER: bot-www WEB_DIR: /var/www jobs: @@ -18,7 +19,7 @@ jobs: - name: Check out repository id: checkout uses: actions/checkout@v4 - github-server-url: 'https://forge.87b59b92.nip.io/' + github-server-url: 'https://forge.of.tahoe-lafs.org/' - name: Change file ownership id: file_ownership run: | @@ -45,7 +46,7 @@ jobs: - name: Build Jekyll site id: build_site run: | - # Overwrite the baseurl for previewonly + # Overwrite the baseurl for preview only if [ "${{ gitea.event_name }}" = 'pull_request' ]; then echo "Overwriting baseurl for pull_request ${{ gitea.event.pull_request.number }}" sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ gitea.event.pull_request.number }}"/' _config.yml @@ -57,16 +58,17 @@ jobs: id: deploy_site run: | if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then - WEB_ROOT="${WEB_DIR}/site" - WEB_HOST="www.${WEB_DOMAIN}" + WEB_ROOT="${WEB_DIR}/live" + WEB_VHOST="home.of.${WEB_DOMAIN}" WEB_CONTEXT='/' else WEB_ROOT="${WEB_DIR}/preview" - WEB_HOST="preview.${WEB_DOMAIN}" + WEB_VHOST="preview.of.${WEB_DOMAIN}" WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/' fi # Save those variabes in the environment for the next steps echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV + echo "WEB_VHOST=${WEB_VHOST}" >> $GITHUB_ENV echo "WEB_CONTEXT=${WEB_CONTEXT}" >> $GITHUB_ENV # Prepare ssh key echo "${{ secrets.WWW_DEPLOY_KEY }}" > ~/.ssh/id_ed25519 @@ -74,7 +76,7 @@ jobs: # Synchronize the local and the remote site rsync -halvi --delete \ -e "ssh -a -x -o StrictHostKeyChecking=no" \ - ./_site/ "${WEB_USER}@${WEB_DOMAIN}:${WEB_ROOT}${WEB_CONTEXT}" + ./_site/ "${WEB_USER}@${WEB_HOST}:${WEB_ROOT}${WEB_CONTEXT}" - name: Comment pull request id: comment_pull_request if: ${{ always() && gitea.event_name == 'pull_request' }} @@ -85,7 +87,7 @@ jobs: "imageOutcome": "${{ steps.build_image.outcome }}", "buildOutcome": "${{ steps.build_site.outcome }}", "deployOutcome": "${{ steps.deploy_site.outcome }}", - "deployWebHost": "${{ env.WEB_HOST }}", + "deployWebHost": "${{ env.WEB_VHOST }}", "deployWebContext": "${{ env.WEB_CONTEXT }}", "gitActor": "${{ gitea.actor }}", "gitEventName": "${{ gitea.event_name }}", diff --git a/.gitea/workflows/jekyll_cleanup.yml b/.gitea/workflows/jekyll_cleanup.yml index b69ad1f..ebbded7 100644 --- a/.gitea/workflows/jekyll_cleanup.yml +++ b/.gitea/workflows/jekyll_cleanup.yml @@ -6,7 +6,7 @@ on: types: [ closed ] env: - WEB_DOMAIN: lafs.eval.latfa.net + WEB_HOST: webforge.of.tahoe-lafs.org WEB_USER: www WEB_ROOT: /var/www/preview WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/" @@ -32,4 +32,4 @@ jobs: chmod 600 ~/.ssh/id_ed25519 # Delete preview context from the remote site echo -e "set sftp:connect-program ssh -a -x -o StrictHostKeyChecking=no; rm -r -f ${WEB_ROOT}${WEB_CONTEXT}\nbye" \ - | lftp sftp://${WEB_USER}:unused@${WEB_DOMAIN} + | lftp sftp://${WEB_USER}:unused@${WEB_HOST} From 04bb3d712b9c79a38d544992156c769db8763e2d Mon Sep 17 00:00:00 2001 From: Benoit Donneaux Date: Wed, 13 Aug 2025 18:16:20 +0200 Subject: [PATCH 5/5] Rename Gitea to Forgejo Signed-off-by: Benoit Donneaux --- {.gitea => .forgejo}/pr-commenter.yml | 0 {.gitea => .forgejo}/workflows/jekyll.yaml | 10 +++++----- {.gitea => .forgejo}/workflows/jekyll_cleanup.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename {.gitea => .forgejo}/pr-commenter.yml (100%) rename {.gitea => .forgejo}/workflows/jekyll.yaml (92%) rename {.gitea => .forgejo}/workflows/jekyll_cleanup.yml (94%) diff --git a/.gitea/pr-commenter.yml b/.forgejo/pr-commenter.yml similarity index 100% rename from .gitea/pr-commenter.yml rename to .forgejo/pr-commenter.yml diff --git a/.gitea/workflows/jekyll.yaml b/.forgejo/workflows/jekyll.yaml similarity index 92% rename from .gitea/workflows/jekyll.yaml rename to .forgejo/workflows/jekyll.yaml index b7e87f0..68eb783 100644 --- a/.gitea/workflows/jekyll.yaml +++ b/.forgejo/workflows/jekyll.yaml @@ -89,10 +89,10 @@ jobs: "deployOutcome": "${{ steps.deploy_site.outcome }}", "deployWebHost": "${{ env.WEB_VHOST }}", "deployWebContext": "${{ env.WEB_CONTEXT }}", - "gitActor": "${{ gitea.actor }}", - "gitEventName": "${{ gitea.event_name }}", - "gitWorkflow": "${{ gitea.workflow }}", - "gitRunNumber": "${{ gitea.run_number }}", - "gitRunAttempt": "${{ gitea.run_attempt }}" + "gitActor": "${{ forgejo.actor }}", + "gitEventName": "${{ forgejo.event_name }}", + "gitWorkflow": "${{ forgejo.workflow }}", + "gitRunNumber": "${{ forgejo.run_number }}", + "gitRunAttempt": "${{ forgejo.run_attempt }}" } config-file: ".gitea/pr-commenter.yml" diff --git a/.gitea/workflows/jekyll_cleanup.yml b/.forgejo/workflows/jekyll_cleanup.yml similarity index 94% rename from .gitea/workflows/jekyll_cleanup.yml rename to .forgejo/workflows/jekyll_cleanup.yml index ebbded7..a527993 100644 --- a/.gitea/workflows/jekyll_cleanup.yml +++ b/.forgejo/workflows/jekyll_cleanup.yml @@ -9,7 +9,7 @@ env: WEB_HOST: webforge.of.tahoe-lafs.org WEB_USER: www WEB_ROOT: /var/www/preview - WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/" + WEB_CONTEXT: "/${{ forgejo.event.pull_request.number }}/" jobs: jekyll_cleanup: runs-on: ubuntu-22.04