From 005539fbf9a58d05eb021ae24831f47cb4df4f8a Mon Sep 17 00:00:00 2001 From: nono-lqdn Date: Tue, 9 Jun 2026 14:42:47 +0200 Subject: [PATCH 1/4] Only run actions when a push happens on the main branch --- .forgejo/workflows/build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 1467c91..bf5467e 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -1,4 +1,7 @@ -on: [push] +on: + push: + branches: + - main jobs: build: runs-on: docker -- 2.39.5 From 742fc6916d61ba5182a0526fac75485f1dd0b1e2 Mon Sep 17 00:00:00 2001 From: nono-lqdn Date: Tue, 9 Jun 2026 14:43:20 +0200 Subject: [PATCH 2/4] Add link to the map in every html file --- contact.html | 1 + guide.template.html | 1 + index.html | 1 + poster.html | 1 + programme.html | 1 + 5 files changed, 5 insertions(+) diff --git a/contact.html b/contact.html index f11e331..c1ca0d6 100644 --- a/contact.html +++ b/contact.html @@ -17,6 +17,7 @@ maison guide programme + carte poster contact diff --git a/guide.template.html b/guide.template.html index 3de6d83..f9c73ec 100644 --- a/guide.template.html +++ b/guide.template.html @@ -23,6 +23,7 @@ BISOUS maison guide programme + carte poster contact diff --git a/index.html b/index.html index 98104b6..7400a9f 100644 --- a/index.html +++ b/index.html @@ -19,6 +19,7 @@ maison guide programme + carte poster contact diff --git a/poster.html b/poster.html index 7ae1ffa..1a5ccb5 100644 --- a/poster.html +++ b/poster.html @@ -17,6 +17,7 @@ maison guide programme + carte poster contact diff --git a/programme.html b/programme.html index 86596fa..d93a568 100644 --- a/programme.html +++ b/programme.html @@ -19,6 +19,7 @@ maison guide programme + carte poster contact -- 2.39.5 From 48f4d689a5fd5ced9e8b6db8231a3ee3cd07aa26 Mon Sep 17 00:00:00 2001 From: nono-lqdn Date: Tue, 9 Jun 2026 14:43:39 +0200 Subject: [PATCH 3/4] Add map download, add guide generation to dockerfile --- Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Dockerfile b/Dockerfile index 818cbb7..5482b4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,20 @@ FROM docker.io/nginx:1.29-alpine +RUN apk add --update --no-cache wget unzip bash pandoc sed + +RUN wget -q https://git.interhacker.space/epickiwi/2026.camp.carte/releases/download/latest/dist.zip +RUN unzip -q dist.zip -d /tmp/carte +RUN mkdir -p /usr/share/nginx/html/carte +RUN cp -r /tmp/carte/dist/* /usr/share/nginx/html/carte/ +RUN rm -rf /tmp/carte +RUN rm -rf dist.zip + +COPY guide.template.html . +COPY update-guide.sh . +RUN bash update-guide.sh + COPY *.html /usr/share/nginx/html +RUN mv guide.html /usr/share/nginx/html COPY assets /usr/share/nginx/html/assets COPY css /usr/share/nginx/html/css COPY js /usr/share/nginx/html/js -- 2.39.5 From c3e1dc84f3d94a17e059895de9731b59565b4a72 Mon Sep 17 00:00:00 2001 From: nono-lqdn Date: Mon, 15 Jun 2026 11:47:27 +0200 Subject: [PATCH 4/4] Move the build actions from Forgejo actions to docker build actions --- .forgejo/workflows/build.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index bf5467e..fe5a699 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -9,19 +9,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Install Pandoc - run: | - apt-get update - apt-get install -y pandoc - - - name: Generate guide.html - run: bash update-guide.sh - - - name: Install Podman - run: | - apt-get update - apt-get install -y podman - - name: Podman Login run: | echo "${{ secrets.DOCKER_PASSWORD }}" | podman login git.interhacker.space --username "${{ secrets.DOCKER_USERNAME }}" --password-stdin -- 2.39.5