From 49d5646b1580d5ea1aaae9c03c980fb4e0a89b71 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 13 Mar 2019 23:45:59 +0100 Subject: [PATCH 01/10] Allow specifying per-branch parameters --- .gitlab-ci.yml | 2 +- .hugo-params | 0 build.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 .hugo-params diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57cf02a..a7bf1d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ build_pages: untracked: true script: - apk add --no-cache --upgrade hugo - - hugo + - hugo $(cat .hugo-params) build_calendar: image: "python:3.7-alpine3.8" diff --git a/.hugo-params b/.hugo-params new file mode 100644 index 0000000..e69de29 diff --git a/build.sh b/build.sh index 2229095..4489ab6 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -hugo +hugo $(cat .hugo-params) tools/merge_cals.py upcoming="$(tools/gen_upcoming.py static/all.ics 14 5|tr '\n' ' ')" cp static/all.ics public/all.ics From 55d13a94e7203152bde8207070628b819f7c902d Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 13 Mar 2019 23:48:35 +0100 Subject: [PATCH 02/10] Adjust hugo params for master --- .hugo-params | 1 + 1 file changed, 1 insertion(+) diff --git a/.hugo-params b/.hugo-params index e69de29..7c49b8b 100644 --- a/.hugo-params +++ b/.hugo-params @@ -0,0 +1 @@ +-b https://berlin.ccc.de From 6d63004173e3a648819593c3b4a4d51908d85e7f Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 14 Mar 2019 23:01:32 +0100 Subject: [PATCH 03/10] Ensure artifacts expire --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd64f9a..e812b66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ build_pages: variables: SHELL: "/bin/sh" artifacts: + expire_in: "1 week" untracked: true script: - apk add --no-cache --upgrade hugo @@ -28,6 +29,7 @@ build_calendar: dependencies: - build_pages artifacts: + expire_in: "1 week" untracked: true variables: SHELL: "/bin/sh" @@ -57,6 +59,7 @@ deploy_staging: name: staging url: https://staging.berlin.ccc.de/ artifacts: + expire_in: "1 week" paths: - public/ only: @@ -81,6 +84,7 @@ deploy_production: name: production url: https://berlin.ccc.de/ artifacts: + expire_in: "1 week" paths: - public/ only: From 20a422bc6511168036f752c553bb2885d8c51bdd Mon Sep 17 00:00:00 2001 From: Ricardo Band Date: Wed, 14 Jun 2023 12:24:12 +0200 Subject: [PATCH 04/10] Update convert_page.sh --- tools/convert_page.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/convert_page.sh b/tools/convert_page.sh index 61f93b1..f34bc5a 100755 --- a/tools/convert_page.sh +++ b/tools/convert_page.sh @@ -14,5 +14,4 @@ curl -s "https://berlin.ccc.de/api.php?action=query&prop=revisions&rvprop=conten | jq -r '.query.pages |..| objects|.["*"]' \ | sed '/null/d' \ | pandoc -f mediawiki -t markdown \ - >> content/$2/$page.md - + >> content/$2/$page.md From c9bff256f265a074996c4f6b479d0003286eedbf Mon Sep 17 00:00:00 2001 From: Andreas Hubel <40266+saerdnaer@users.noreply.github.com> Date: Wed, 16 Oct 2024 22:20:54 +0200 Subject: [PATCH 05/10] add cronjob --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7ced62..5d29eac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,8 @@ name: Release website on: + schedule: + - cron: "0 4 * * *" push: branches: - staging From 181fd690ba693b06902b7dcdfd30b867a09cbc87 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 17 Oct 2024 00:01:56 +0200 Subject: [PATCH 06/10] fix: update templates --- layouts/datengarten/single.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/datengarten/single.html b/layouts/datengarten/single.html index 337e465..d27cab3 100644 --- a/layouts/datengarten/single.html +++ b/layouts/datengarten/single.html @@ -41,7 +41,7 @@ {{ if (.Params.comments) | or (and (or (not (isset .Params "comments")) (eq .Params.comments nil)) (and .Site.Params.comments (ne .Type "page"))) }} - {{ if .Site.DisqusShortname }} + {{ if .Site.Config.Services.Disqus.Shortname }}
{{ template "_internal/disqus.html" . }}
From 09ca45536c55f3a4567e3b0cd682b30ec1ea2d29 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 17 Oct 2024 00:03:18 +0200 Subject: [PATCH 07/10] bump theme --- themes/beautifulhugo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/beautifulhugo b/themes/beautifulhugo index 1e66e4a..3e59df5 160000 --- a/themes/beautifulhugo +++ b/themes/beautifulhugo @@ -1 +1 @@ -Subproject commit 1e66e4ae945f12da3f8e6fb603c396156c1b04e9 +Subproject commit 3e59df5ca7f034c2ebbeac7ca0962b6e163c09e4 From 1a3736fb5cd82920483ca882f64272348e66d064 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:07:45 +0000 Subject: [PATCH 08/10] gh-action: bump peaceiris/actions-hugo from 2 to 3 Bumps [peaceiris/actions-hugo](https://github.com/peaceiris/actions-hugo) from 2 to 3. - [Release notes](https://github.com/peaceiris/actions-hugo/releases) - [Changelog](https://github.com/peaceiris/actions-hugo/blob/main/CHANGELOG.md) - [Commits](https://github.com/peaceiris/actions-hugo/compare/v2...v3) --- updated-dependencies: - dependency-name: peaceiris/actions-hugo dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d29eac..fdcca45 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: submodules: recursive fetch-depth: 0 - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@v3 with: hugo-version: 'latest' - name: Build pages From 71348c56dbd790401e408e930b1b693d09b0a533 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 28 Feb 2024 19:05:54 +0100 Subject: [PATCH 09/10] Add streaming URL --- content/datengarten/110.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/datengarten/110.md b/content/datengarten/110.md index dcd79cd..dd1633d 100644 --- a/content/datengarten/110.md +++ b/content/datengarten/110.md @@ -12,8 +12,8 @@ event: end: 2024-02-28T21:30:00+02:00 location: CCCB language: de -streaming: false -#recording: https://streaming.media.ccc.de/datengarten +streaming: true +recording: https://streaming.media.ccc.de/datengarten/cccb --- Um die Energiewende voranzutreiben, wird die Kernfusion oft als das ultimative Kraftwerk und als die Lösung all unserer energetischen Probleme angesehen, dennoch blieb diese Technologie seit 1960 stets “dreißig Jahre entfernt”. From 8baed0484267bf435fcec9f320818f2c91fb9d52 Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Wed, 8 Jan 2025 12:53:32 +0100 Subject: [PATCH 10/10] modified amateurfunk to not advertize open club on tuesdays --- content/page/amateurfunk.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/page/amateurfunk.md b/content/page/amateurfunk.md index 4dcbf4c..0fa1309 100644 --- a/content/page/amateurfunk.md +++ b/content/page/amateurfunk.md @@ -8,7 +8,9 @@ menu: --- ![Logo der Chaoswelle](/img/chaoswelle.png "Logo der Chaoswelle") -**Jeden Dienstag ab 20 Uhr** treffen sich Funkamateure oder Interessierte +Im Moment finden keine Amateurfunktreffen mehr im CCCB statt + +Früher trafen sich Funkamateure oder Interessierte rund um drahtlose Kommunikation im Chaos Computer Club Berlin im Rahmen des [Club Discordia]({{< ref "clubdiscordia.md" >}}). Manchmal gibt es Vorträge oder Workshops, die dann im Kalender separat angezeigt werden. Gelegentlich