Compare commits

...
Sign in to create a new pull request.
Author SHA1 Message Date
stb
8c9cbe81aa Merge pull request 'Enables 40C3 event card and links to Hamburg Hackertours' (#7) from feat/enable-40c3 into main
Reviewed-on: CCCHH/hacker.tours-website#7
2026-11-14 18:37:53 +01:00
stb
061a74c1c1 Merge branch 'main' into feat/enable-40c3 2026-11-14 18:37:31 +01:00
stb
e2ec544131 Merge pull request 'Fix staging preview URLs' (#8) from fix/staging-preview-links into main
Reviewed-on: CCCHH/hacker.tours-website#8
Reviewed-by: stb <stb@noreply.git.hamburg.ccc.de>
2026-11-14 18:37:20 +01:00
stb
c3e4d3c9cf Merge pull request 'Adds cards overview from hamburg.hackertours.de' (#6) from feat/homepage-event-cards into main
Reviewed-on: CCCHH/hacker.tours-website#6
Reviewed-by: stb <stb@noreply.git.hamburg.ccc.de>
2026-11-14 18:36:54 +01:00
790fbdd5ca
Fix staging preview URLs and cleanup path
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-11-14 15:08:22 +01:00
2927606116
Enable 40C3 event card and link to Hamburg Hackertours
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-11-14 14:47:41 +01:00
4 changed files with 5 additions and 7 deletions

View file

@ -20,4 +20,4 @@ jobs:
echo "${{ secrets.SSH_KNOWN_HOSTS_FILE }}" > ./known_hosts
- name: Staging Deployment - Remove PR from staging
run: |
ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/"
ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts' hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de -t "rm -r /var/www/staging.hacker.tours/pr${{ github.event.pull_request.number }}/"

View file

@ -50,7 +50,7 @@ jobs:
- name: Deploy - Upload PR to staging
if: github.event_name == 'pull_request'
run: |
echo "Deploying to staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}"
echo "Deploying to staging.hacker.tours/pr${{ github.event.pull_request.number }}"
rsync -v -r --delete -e "ssh -i deploykey.priv -o 'UserKnownHostsFile ./known_hosts'" public/ hackertours-website-deploy@public-web-static-intern.hamburg.ccc.de:/var/www/staging.hacker.tours/pr${{ github.event.pull_request.number }}/
- name: Deploy - Add comment to PR with staging URL
if: github.event_name == 'pull_request' && github.event.action == 'opened'
@ -60,7 +60,7 @@ jobs:
${{ github.event.pull_request.base.repo.url }}/issues/${{ github.event.pull_request.number }}/comments \
-H "Content-Type: application/json" \
-H "Authorization: token $GITHUB_TOKEN" \
--data '{ "body": "You can view your changes at https://staging.hamburg.ccc.de/pr${{ github.event.pull_request.number }}/" }'
--data '{ "body": "You can view your changes at https://staging.hacker.tours/pr${{ github.event.pull_request.number }}/" }'
- name: Deploy - Upload to prod
if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref_name == 'main'

View file

@ -14,8 +14,7 @@ events:
event: 40. Chaos Communication Congress
date: 27.–30. Dezember 2026
location: Hamburg Messe
url: https://events.ccc.de/congress/2026/
status: In Vorbereitung
url: https://hackertours.hamburg.ccc.de/de/40c3/
- code: EH23
title: The Bunny is a Lie
event: Easterhegg 2026

View file

@ -14,8 +14,7 @@ events:
event: 40th Chaos Communication Congress
date: 27–30 December 2026
location: Hamburg Messe
url: https://events.ccc.de/congress/2026/
status: In preparation
url: https://hackertours.hamburg.ccc.de/de/40c3/
- code: EH23
title: The Bunny is a Lie
event: Easterhegg 2026