Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
This commit is contained in:
parent
52382d65e3
commit
45b311c638
|
@ -47,9 +47,9 @@ jobs:
|
||||||
id: build_site
|
id: build_site
|
||||||
run: |
|
run: |
|
||||||
# Overwrite the baseurl for preview only
|
# Overwrite the baseurl for preview only
|
||||||
if [ "${{ gitea.event_name }}" = 'pull_request' ]; then
|
if [ "${{ forge.event_name }}" = 'pull_request' ]; then
|
||||||
echo "Overwriting baseurl for pull_request ${{ gitea.event.pull_request.number }}"
|
echo "Overwriting baseurl for pull_request ${{ forge.event.pull_request.number }}"
|
||||||
sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ gitea.event.pull_request.number }}"/' _config.yml
|
sed -i -r -e 's/^baseurl:\s*"([^"]*)"/baseurl: "\1\/${{ forge.event.pull_request.number }}"/' _config.yml
|
||||||
grep "^baseurl:" _config.yml
|
grep "^baseurl:" _config.yml
|
||||||
fi
|
fi
|
||||||
docker-compose run --rm -v "${JOB_CONTAINER_NAME}:/site" -w /site \
|
docker-compose run --rm -v "${JOB_CONTAINER_NAME}:/site" -w /site \
|
||||||
|
@ -57,14 +57,14 @@ jobs:
|
||||||
- name: Deploy Jekyll site
|
- name: Deploy Jekyll site
|
||||||
id: deploy_site
|
id: deploy_site
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ gitea.ref }}" = 'refs/heads/main' ]; then
|
if [ "${{ forge.ref }}" = 'refs/heads/main' ]; then
|
||||||
WEB_ROOT="${WEB_DIR}/live"
|
WEB_ROOT="${WEB_DIR}/live"
|
||||||
WEB_VHOST="home.of.${WEB_DOMAIN}"
|
WEB_VHOST="home.of.${WEB_DOMAIN}"
|
||||||
WEB_CONTEXT='/'
|
WEB_CONTEXT='/'
|
||||||
else
|
else
|
||||||
WEB_ROOT="${WEB_DIR}/preview"
|
WEB_ROOT="${WEB_DIR}/preview"
|
||||||
WEB_VHOST="preview.of.${WEB_DOMAIN}"
|
WEB_VHOST="preview.of.${WEB_DOMAIN}"
|
||||||
WEB_CONTEXT='/${{ gitea.event.pull_request.number }}/'
|
WEB_CONTEXT='/${{ forge.event.pull_request.number }}/'
|
||||||
fi
|
fi
|
||||||
# Save those variabes in the environment for the next steps
|
# Save those variabes in the environment for the next steps
|
||||||
echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV
|
echo "WEB_HOST=${WEB_HOST}" >> $GITHUB_ENV
|
||||||
|
@ -79,7 +79,7 @@ jobs:
|
||||||
./_site/ "${WEB_USER}@${WEB_HOST}:${WEB_ROOT}${WEB_CONTEXT}"
|
./_site/ "${WEB_USER}@${WEB_HOST}:${WEB_ROOT}${WEB_CONTEXT}"
|
||||||
- name: Comment pull request
|
- name: Comment pull request
|
||||||
id: comment_pull_request
|
id: comment_pull_request
|
||||||
if: ${{ always() && gitea.event_name == 'pull_request' }}
|
if: ${{ always() && forge.event_name == 'pull_request' }}
|
||||||
uses: https://github.com/exercism/pr-commenter-action@v1.5.1
|
uses: https://github.com/exercism/pr-commenter-action@v1.5.1
|
||||||
with:
|
with:
|
||||||
template-variables: |
|
template-variables: |
|
||||||
|
@ -89,10 +89,10 @@ jobs:
|
||||||
"deployOutcome": "${{ steps.deploy_site.outcome }}",
|
"deployOutcome": "${{ steps.deploy_site.outcome }}",
|
||||||
"deployWebHost": "${{ env.WEB_VHOST }}",
|
"deployWebHost": "${{ env.WEB_VHOST }}",
|
||||||
"deployWebContext": "${{ env.WEB_CONTEXT }}",
|
"deployWebContext": "${{ env.WEB_CONTEXT }}",
|
||||||
"gitActor": "${{ gitea.actor }}",
|
"gitActor": "${{ forge.actor }}",
|
||||||
"gitEventName": "${{ gitea.event_name }}",
|
"gitEventName": "${{ forge.event_name }}",
|
||||||
"gitWorkflow": "${{ gitea.workflow }}",
|
"gitWorkflow": "${{ forge.workflow }}",
|
||||||
"gitRunNumber": "${{ gitea.run_number }}",
|
"gitRunNumber": "${{ forge.run_number }}",
|
||||||
"gitRunAttempt": "${{ gitea.run_attempt }}"
|
"gitRunAttempt": "${{ forge.run_attempt }}"
|
||||||
}
|
}
|
||||||
config-file: ".gitea/pr-commenter.yml"
|
config-file: ".forgejo/pr-commenter.yml"
|
|
@ -9,7 +9,7 @@ env:
|
||||||
WEB_HOST: webforge.of.tahoe-lafs.org
|
WEB_HOST: webforge.of.tahoe-lafs.org
|
||||||
WEB_USER: www
|
WEB_USER: www
|
||||||
WEB_ROOT: /var/www/preview
|
WEB_ROOT: /var/www/preview
|
||||||
WEB_CONTEXT: "/${{ gitea.event.pull_request.number }}/"
|
WEB_CONTEXT: "/${{ forge.event.pull_request.number }}/"
|
||||||
jobs:
|
jobs:
|
||||||
jekyll_cleanup:
|
jekyll_cleanup:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
Loading…
Reference in a new issue