From c40ba3de32c0e5369d8153d4b6ad956ab06a33cc Mon Sep 17 00:00:00 2001 From: June Date: Sat, 26 Jul 2025 16:11:02 +0200 Subject: [PATCH 1/2] ci: make step conditions more structured Either have a step always be executed, be executed for prod or be executed for a PR (staging) and use the same conditions for each of these cases. --- .forgejo/workflows/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 65befb1..4f749f5 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -34,12 +34,13 @@ jobs: fetch-depth: 0 # pull full history for page lastmod by git commit date - name: Build website - prod + if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' run: | ./fetch-calendar.sh hugo - name: Build website - staging - if: github.ref_name != 'main' + if: github.event_name == 'pull_request' run: | sed -i "s#baseURL = 'https://hamburg.ccc.de/'#baseURL = 'https://staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/'#" hugo.toml sed -i "s#index = true#index = false#" hugo.toml @@ -48,7 +49,6 @@ jobs: hugo --buildFuture - name: Deploy - Prepare keys - if: github.event_name == 'push' || github.event_name == 'pull_request' || github.event_name == 'schedule' run: | echo "${{ secrets.SSH_DEPLOY_KEY }}" > deploykey.priv chmod 400 deploykey.priv -- 2.49.0 From 017bc99285d90b90318bd6483e3f77dfb419e7b3 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 29 Jul 2025 20:34:17 +0200 Subject: [PATCH 2/2] wip: testing custom actions --- .forgejo/workflows/deploy.yaml | 3 +++ actions/build-website/action.yml | 7 +++++++ 2 files changed, 10 insertions(+) create mode 100644 actions/build-website/action.yml diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 4f749f5..9b6960d 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -33,6 +33,9 @@ jobs: with: fetch-depth: 0 # pull full history for page lastmod by git commit date + - name: Build website + uses: ./actions/build-website + - name: Build website - prod if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main' run: | diff --git a/actions/build-website/action.yml b/actions/build-website/action.yml new file mode 100644 index 0000000..ce06591 --- /dev/null +++ b/actions/build-website/action.yml @@ -0,0 +1,7 @@ +name: Build Website +description: Build Website Test + +runs: + using: docker + image: hugomods/hugo:exts-0.148.1 + -- 2.49.0