Merge branch 'main-staging' into staging

This commit is contained in:
April John 2026-08-28 16:00:55 +02:00
commit 75ae1c30a2
35 changed files with 10781 additions and 761 deletions

View file

@ -27,8 +27,7 @@ This is the website of the CCCB.
5. Point your browser to: <http://localhost:1313/>
Every change you make on the project will be reflected in your browser as long
as `hugo serve` is running.
Every change you make on the project will be reflected in your browser as long as `hugo serve` is running.
The *"Nächste Veranstaltungen"* calendar on the home page is rendered by
Hugo via the `calendar` shortcode, which fetches `all.ics` client-side.
@ -38,7 +37,6 @@ upload, run:
```shell
./build.sh
python3 -m http.server -d public 1313
```
`build.sh` runs `hugo`, generates `all.ics`, and copies it into `public/`.
@ -54,18 +52,21 @@ To build with *nix*: `nix build '.?submodules=1#production-content'`
3. Commit (and push) your change.
4. ~~GitHub Actions is running the release workflow.~~
- If successful, check [Staging Website](https://staging.berlin.ccc.de/) if change is correct.
5. Create merge request to merge changes from `staging` to `production` branch. Ask somebody to check merge request or if small change, merge yourself.
5. Create a merge request to merge changes from `staging` to `production` branch. Ask somebody to check merge request or
if small change, merge yourself.
6. ~~GitHub Actions is running the release workflow.~~
- If successfull, check [Website](https://berlin.ccc.de/) if change is correct.
7. Profit!
## Nix stuff
- After entering the shell with `nix develop`, hugo is available and `hugo serve` should work
- Python including required packages will be available, so the `build.sh` should work without a venv
- You can build the staging and production builds with `nix build .#staging-content` and `nix build .#production-content`
- Do not update the nixpkgs branch - 25.05 contains a newer hugo version that is incompatible with the theme (last checked June 2025)
- After entering the shell with `nix develop`, hugo is available and `hugo serve` and `./build.sh` should work
- You can build the staging and production builds with `nix build .#staging-content` and
`nix build .#production-content`
- Do not update the nixpkgs branch - 25.05 contains a newer hugo version that is incompatible with the theme (last
checked June 2025)
---
Made with ❤️ and [Hugo](https://gohugo.io).