Merge branch 'staging' into 'production'
Staging See merge request cccb/www!44
This commit is contained in:
		
						commit
						52e402128a
					
				
					 3 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -25,7 +25,7 @@ build_pages:
 | 
			
		|||
    - hugo $(cat .hugo-params)
 | 
			
		||||
 | 
			
		||||
build_calendar:
 | 
			
		||||
  image: "python:3.7-alpine3.8"
 | 
			
		||||
  image: "python:3.11.1-alpine3.17"
 | 
			
		||||
  stage: calendar
 | 
			
		||||
  dependencies: 
 | 
			
		||||
    - 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
 | 
			
		||||
 | 
			
		||||
deploy_staging:
 | 
			
		||||
  image: "alpine:3.8"
 | 
			
		||||
  image: "alpine:3.17"
 | 
			
		||||
  stage: deploy
 | 
			
		||||
  dependencies: 
 | 
			
		||||
    - build_calendar
 | 
			
		||||
| 
						 | 
				
			
			@ -67,7 +67,7 @@ deploy_staging:
 | 
			
		|||
     - staging
 | 
			
		||||
 | 
			
		||||
deploy_production:
 | 
			
		||||
  image: "alpine:3.8"
 | 
			
		||||
  image: "alpine:3.17"
 | 
			
		||||
  stage: deploy
 | 
			
		||||
  dependencies: 
 | 
			
		||||
    - build_calendar
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,7 +27,7 @@ permalinks:
 | 
			
		|||
 | 
			
		||||
Author:
 | 
			
		||||
  twitter: "clubdiscordia"
 | 
			
		||||
  email: "mail2022@berlin.ccc.de"
 | 
			
		||||
  email: "mail2023@berlin.ccc.de"
 | 
			
		||||
  mastodon: "chaos.social/@clubdiscordia"
 | 
			
		||||
  irc: "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,7 @@ Postfach 64 02 36
 | 
			
		|||
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.
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Reference in a new issue