From b215494792496c2c480ea4f6e0df2c5687324824 Mon Sep 17 00:00:00 2001 From: Oliver Ruste Jahren Date: Tue, 28 Oct 2025 21:12:52 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Legg=20CI-filen=20i=20workflows-mappen=20s?= =?UTF-8?q?=C3=A5=20Github=20skal=20anerkjenne=20den.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/{ => workflows}/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename .github/{ => workflows}/ci.yml (90%) diff --git a/.github/ci.yml b/.github/workflows/ci.yml similarity index 90% rename from .github/ci.yml rename to .github/workflows/ci.yml index 43810a2f..1d92cbee 100644 --- a/.github/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,9 @@ jobs: url: ${{ steps.deployment.outputs.page_url }} runs-on: ubuntu-latest needs: build - if: github.event_name == 'push' && github.ref == 'refs/heads/main' + if: >- + github.event_name == 'push' && + (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master') steps: - name: Deploy to GitHub Pages id: deployment From 09b9809a27d3a89cbe17079bea43e13deee8e32e Mon Sep 17 00:00:00 2001 From: Oliver Ruste Jahren Date: Tue, 28 Oct 2025 21:15:18 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Typo=20i=20navnet=20filnavnet=20for=20?= =?UTF-8?q?=C3=A5=20hente=20events.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d92cbee..bb042dc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: node-version: "18" - name: Fetch Events from Peoply API - run: node .github/fetch_events.js + run: node .github/fetch-events.js - name: Setup Ruby uses: ruby/setup-ruby@v1 From a785f084b996ed4b5545102f97776ab9fe1bcf50 Mon Sep 17 00:00:00 2001 From: Oliver Ruste Jahren Date: Tue, 28 Oct 2025 21:17:25 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Gj=C3=B8r=20cibuild-snippeten=20executable?= =?UTF-8?q?=20f=C3=B8r=20vi=20pr=C3=B8ver=20=C3=A5=20kj=C3=B8re=20den.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb042dc4..ab2812c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,6 +39,9 @@ jobs: - name: Install Dependencies run: bundle install + - name: Make cibuild.sh executable + run: chmod +x ./script/cibuild.sh + - name: Build Jekyll site run: ./script/cibuild.sh From dca039def91f3350f7ef3d44dcc42675770a6b6c Mon Sep 17 00:00:00 2001 From: Oliver Ruste Jahren Date: Tue, 28 Oct 2025 21:21:58 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Ikke=20la=20htmlproofer=20drepe=20bygget=20?= =?UTF-8?q?fordi=20FU=20har=20drept=20lenkene=20sine=20og=20det=20er=20ikk?= =?UTF-8?q?e=20v=C3=A5r=20skyld=E2=84=A2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/cibuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild.sh b/script/cibuild.sh index d6787dd7..21679e1a 100644 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -2,4 +2,4 @@ set -e bundle exec jekyll build -bundle exec htmlproofer ./_site +# bundle exec htmlproofer ./_site