cccb-website-team/www
1
1
Fork 2
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'staging' into 'production'

Browse source 
Staging

See merge request cccb/www!44
This commit is contained in:
Daniel Molkentin 2023-01-28 20:19:24 +00:00
commit 52e402128a
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -25,7 +25,7 @@ build_pages:
- hugo $(cat .hugo-params) - hugo $(cat .hugo-params)
build_calendar: build_calendar:
image: "python:3.7-alpine3.8" image: "python:3.11.1-alpine3.17"
stage: calendar stage: calendar
dependencies: dependencies:
- build_pages - build_pages
@ -42,7 +42,7 @@ build_calendar:
- upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5|tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html - upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5|tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html
deploy_staging: deploy_staging:
image: "alpine:3.8" image: "alpine:3.17"
stage: deploy stage: deploy
dependencies: dependencies:
- build_calendar - build_calendar
@ -67,7 +67,7 @@ deploy_staging:
- staging - staging
deploy_production: deploy_production:
image: "alpine:3.8" image: "alpine:3.17"
stage: deploy stage: deploy
dependencies: dependencies:
- build_calendar - build_calendar

2
config.yaml
View file

@ -27,7 +27,7 @@ permalinks:
Author: Author:
twitter: "clubdiscordia" twitter: "clubdiscordia"
email: "mail2022@berlin.ccc.de" email: "mail2023@berlin.ccc.de"
mastodon: "chaos.social/@clubdiscordia" mastodon: "chaos.social/@clubdiscordia"
irc: "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb" irc: "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb"

2
content/page/impressum.md
View file

@ -24,7 +24,7 @@ Postfach 64 02 36
10048 Berlin 10048 Berlin
``` ```
E-Mail: <mail2022@berlin.ccc.de> E-Mail: <mail2023@berlin.ccc.de>
Eingetragen im Vereinsregister des Amtsgerichts Berlin Charlottenburg unter der Vereinsregisternummer 16058. Eingetragen im Vereinsregister des Amtsgerichts Berlin Charlottenburg unter der Vereinsregisternummer 16058.