From 49d5646b1580d5ea1aaae9c03c980fb4e0a89b71 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Wed, 13 Mar 2019 23:45:59 +0100 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 7e0793e078853d7ab271bf71eda7d17adcd84c29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 16:18:45 +0000 Subject: [PATCH 5/5] gh-action: bump thedoctor0/zip-release from 0.7.1 to 0.7.6 Bumps [thedoctor0/zip-release](https://github.com/thedoctor0/zip-release) from 0.7.1 to 0.7.6. - [Release notes](https://github.com/thedoctor0/zip-release/releases) - [Commits](https://github.com/thedoctor0/zip-release/compare/0.7.1...0.7.6) --- updated-dependencies: - dependency-name: thedoctor0/zip-release dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 251729e..0b7ec42 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,7 +82,7 @@ jobs: - name: Generate timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H%M%SZ')" >> $GITHUB_ENV - name: Create Release Archive - uses: thedoctor0/zip-release@0.7.1 + uses: thedoctor0/zip-release@0.7.6 with: type: zip filename: ../release-staging-${{ env.timestamp }}.zip @@ -110,7 +110,7 @@ jobs: - name: Generate timestamp run: echo "timestamp=$(date -u +'%Y-%m-%dT%H%M%SZ')" >> $GITHUB_ENV - name: Create Release Archive - uses: thedoctor0/zip-release@0.7.1 + uses: thedoctor0/zip-release@0.7.6 with: type: zip filename: ../release-production-${{ env.timestamp }}.zip