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

Merge pull request 'staging -> production' (#1) from staging into production

Browse source 
Reviewed-on: #1
This commit is contained in:
murmeldin 2025-03-02 18:27:43 +01:00
parent 9a92b873da 1e4570dc6f
commit 00b449646c
24 changed files with 4 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.forgejo/CODEOWNERS
View file

@ -1 +0,0 @@
* @cccb/web

28
.forgejo/dependabot.yml
View file

@ -1,28 +0,0 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "staging"
schedule:
interval: "weekly"
commit-message:
prefix: "gh-action"
labels:
- "gh-action"
- "dependencies"
reviewers:
- "cccb/web"
- package-ecosystem: "pip"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
commit-message:
prefix: "python"
labels:
- "python"
- "dependencies"
reviewers:
- "cccb/web"

73
.forgejo/workflows/release.yml
View file

@ -1,73 +0,0 @@
name: Release website
on:
schedule:
- cron: "0 4 * * *"
push:
branches:
- staging
- production
pull_request:
workflow_dispatch:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: 'latest'
- name: Build pages
run: hugo $(cat .hugo-params)
- name: Add de_DE.UTF-8 locale
run: |
sudo apt-get update
sudo apt-get -y install locales
sudo locale-gen de_DE.UTF-8
- name: Setup Python
uses: actions/setup-python@v5
with:
cache: 'pip'
- name: Install dependencies
run: |
pip install --upgrade pip setuptools wheel
pip install -r requirements.txt
- name: Generate calendars
run: python tools/merge_cals.py
- name: Copy calendar to output dir
run: cp static/all.ics public/all.ics
- name: Update homepage with latest event
run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html
- 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.6
with:
type: zip
filename: ../release-${{ github.ref_name }}-${{ env.timestamp }}.zip
directory: public
- name: Create Release
uses: ncipollo/release-action@v1.16.0
with:
tag: ${{ github.ref_name }}-${{ env.timestamp }}
name: Website ${{ github.ref_name }} version ${{ env.timestamp }}
body: Website ${{ github.ref_name }} version ${{ env.timestamp }}
artifacts: release-${{ github.ref_name }}-${{ env.timestamp }}.zip
token: ${{ secrets.GITEA_TOKEN }}

1
.github/CODEOWNERS vendored
View file

@ -1 +0,0 @@
* @cccb/web

28
.github/dependabot.yml vendored
View file

@ -1,28 +0,0 @@
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
target-branch: "staging"
schedule:
interval: "weekly"
commit-message:
prefix: "gh-action"
labels:
- "gh-action"
- "dependencies"
reviewers:
- "cccb/web"
- package-ecosystem: "pip"
directory: "/"
target-branch: "dev"
schedule:
interval: "weekly"
commit-message:
prefix: "python"
labels:
- "python"
- "dependencies"
reviewers:
- "cccb/web"

129
.github/workflows/release.yml vendored
View file

@ -1,129 +0,0 @@
name: Release website
on:
schedule:
- cron: "0 4 * * *"
push:
branches:
- staging
- production
pull_request:
workflow_dispatch:
jobs:
pages:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
- name: Setup Hugo
uses: peaceiris/actions-hugo@v3
with:
hugo-version: 'latest'
- name: Build pages
run: hugo $(cat .hugo-params)
- uses: actions/upload-artifact@v4
name: Upload pages
with:
name: pages
path: public
calendar:
needs: [ pages ]
runs-on: ubuntu-latest
steps:
- name: Add de_DE.UTF-8 locale
run: |
sudo apt-get update
sudo apt-get -y install locales
sudo locale-gen de_DE.UTF-8
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@v5
with:
cache: 'pip' # caching pip dependencies
- name: Install dependencies
run: |
pip install --upgrade pip setuptools wheel
pip install -r requirements.txt
- name: Download pages
uses: actions/download-artifact@v4
with:
name: pages
path: public/
- name: Generate calendars
run: python tools/merge_cals.py
- name: Copy calendar to output dir
run: cp static/all.ics public/all.ics
- name: Update homepage with latest event
run: upcoming="$(python tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')" && sed -i "s#CALENDAR#$upcoming#g" public/index.html
- uses: actions/upload-artifact@v4
name: Upload pages
with:
name: enhanced_pages
path: public
staging:
needs: [ calendar ]
runs-on: ubuntu-latest
environment: staging
if: (github.ref == 'refs/heads/staging' && github.event_name == 'push') || github.event_name == 'schedule'
steps:
- name: Download pages
uses: actions/download-artifact@v4
with:
name: enhanced_pages
path: public
- 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.6
with:
type: zip
filename: ../release-staging-${{ env.timestamp }}.zip
directory: public
- name: Create Release
uses: ncipollo/release-action@v1.16.0
with:
tag: staging-${{ env.timestamp }}
name: Website staging version ${{ env.timestamp }}
body: Website staging version ${{ env.timestamp }}
artifacts: release-staging-${{ env.timestamp }}.zip
token: ${{ secrets.GITHUB_TOKEN }}
production:
needs: [ calendar ]
runs-on: ubuntu-latest
environment: production
if: (github.ref == 'refs/heads/production' && github.event_name == 'push') || github.event_name == 'schedule'
steps:
- name: Download pages
uses: actions/download-artifact@v4
with:
name: enhanced_pages
path: public
- 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.6
with:
type: zip
filename: ../release-production-${{ env.timestamp }}.zip
directory: public
- name: Create Release
uses: ncipollo/release-action@v1.16.0
with:
makeLatest: true
tag: production-${{ env.timestamp }}
name: Website production version ${{ env.timestamp }}
body: Website production version ${{ env.timestamp }}
artifacts: release-production-${{ env.timestamp }}.zip
token: ${{ secrets.GITHUB_TOKEN }}

6
config/_default/params.toml
View file

@ -26,8 +26,8 @@ backgroundImageWidth = 1200
defaultFeaturedImage = "/img/avatar-CCCB-Logo.png" # used as default for featured images in all articles
# highlightCurrentMenuArea = true
# smartTOC = true
# smartTOCHideUnfocusedChildren = true
smartTOC = true
smartTOCHideUnfocusedChildren = true
giteaDefaultServer = "https://git.fsfe.org"
forgejoDefaultServer = "https://v8.next.forgejo.org"
@ -68,7 +68,7 @@ forgejoDefaultServer = "https://v8.next.forgejo.org"
showBreadcrumbs = true
showDraftLabel = true
showEdit = true
editURL = "https://github.com/cccb/www/tree/staging/content/"
editURL = "https://git.berlin.ccc.de/cccb-website-team/www/src/branch/staging/content/"
editAppendPath = true
seriesOpened = false
showHeadingAnchors = true

0
content/page/amateurfunk.md → content/veranstaltungen/amateurfunk.md
View file

0
content/page/bastelabend.md → content/veranstaltungen/bastelabend.md
View file

0
content/page/chaosradio.md → content/veranstaltungen/chaosradio.md
View file

2
content/page/clubdiscordia.md → content/veranstaltungen/clubdiscordia.md
View file

@ -12,7 +12,7 @@ menu:
parent: "Veranstaltungen"
---
![Kochen in der CCCB Küche](/img/club/Kochen_in_der_CCCB_Küche.jpg)
![E-Lab im CCCB](/img/club/e-lab-kisten.jpg)
Der **Club Discordia** ist ein öffentliches Treffen in den Clubräumen des CCC Berlin. Jeder, der Lust hat, ist eingeladen, **Donnerstags so ab ca. 19 Uhr bis 24 Uhr** vorbeizukommen. Wer will, kann seinen Computer mitbringen und sollte das auch tun, sonst ist es langweilig wenn die Nerds erstmal nicht mit einem reden oder wenig los ist.

0
content/page/cms.md → content/veranstaltungen/cms.md
View file

0
content/page/datengarten.md → content/veranstaltungen/datengarten.md
View file

0
content/page/mitgliedschaft-infos.md → content/veranstaltungen/mitgliedschaft-infos.md
View file

0
content/page/openwrt.md → content/veranstaltungen/openwrt.md
View file

0
content/page/plenum.md → content/veranstaltungen/plenum.md
View file

0
content/page/spieleabend.md → content/veranstaltungen/spieleabend.md
View file

0
content/page/subbotnik.md → content/veranstaltungen/subbotnik.md
View file

0
content/page/anfahrt.md → content/verein/anfahrt.md
View file

0
content/page/calendar.md → content/verein/calendar.md
View file

0
content/page/fotos.md → content/verein/fotos.md
View file

0
content/page/mastodon.md → content/verein/mastodon.md
View file

BIN
static/img/club/Kochen_in_der_CCCB_Küche.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 MiB

0
static/img/club/40544370280_1703903e06.jpg → static/img/club/e-lab-kisten.jpg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB