Skip to content

Commit 643738b

Browse files
authored
Merge branch 'ep2025' into ep2025-special-event
2 parents a8ee572 + 75a7707 commit 643738b

File tree

11 files changed

+190
-57
lines changed

11 files changed

+190
-57
lines changed

.github/workflows/build-deploy.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ jobs:
3333
- name: Install dependencies
3434
run: make install
3535

36-
- name: Build the website
37-
run: make build MODE=production
38-
3936
- name: Set up SSH key
4037
uses: webfactory/[email protected]
4138
with:
@@ -44,5 +41,7 @@ jobs:
4441
- name: ssh keyscan
4542
run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
4643

47-
- name: Deploy to server
44+
- name: Build and Deploy to server
45+
env:
46+
MODE: "production"
4847
run: make deploy FORCE_DEPLOY=true

.github/workflows/preview.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ jobs:
3636
- name: Install dependencies
3737
run: make install
3838

39-
- name: Build the website
40-
env:
41-
BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
42-
GIT_VERSION: "${{ env.GITHUB_COMMIT_HASH }}"
43-
MODE: "preview"
44-
run: make build
45-
4639
- name: Set up SSH key
4740
uses: webfactory/[email protected]
4841
with:
@@ -51,9 +44,11 @@ jobs:
5144
- name: ssh keyscan
5245
run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
5346

54-
- name: Upload preview
47+
- name: Build and upload preview
5548
env:
5649
BRANCH: "${{ env.GITHUB_BRANCH_NAME }}"
50+
GIT_VERSION: "${{ env.GITHUB_COMMIT_HASH }}"
51+
MODE: "preview"
5752
run: make preview
5853

5954
- name: Get safe branch and export to env

.github/workflows/update-data.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

Makefile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ build:
4848

4949
preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
5050
preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
51+
preview: build
5152
preview:
5253
@echo "Preview site URL: $(PREVIEW_SITE_URL)"
5354
echo $(TARGET)
@@ -61,17 +62,18 @@ preview:
6162
$(REMOTE_CMD) "bash -c '\
6263
cd $(RELEASES_DIR) && \
6364
echo \"[INFO] Cleaning:\" && \
64-
ls -1dt */ \
65-
| sed \"s:/*\\\$$::\" \
66-
| grep -v ^current\\\$$ \
67-
| grep -v ^$(TIMESTAMP)\\\$$ \
68-
| tail -n +2 \
65+
ls -1 */ \
66+
| sed \"s:/*\\\$$::\" \
67+
| grep \"^2025\" \
68+
| sort -r \
69+
| tail -n +4 \
6970
| xargs -r -I{} echo rm -rf \"{}\"'"
7071

7172

7273
ifeq ($(FORCE_DEPLOY), true)
7374
deploy: RELEASES_DIR = $(VPS_PROD_PATH)/releases
7475
deploy: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
76+
deploy: build
7577
deploy:
7678
@echo "\n\n**** Deploying branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
7779
$(REMOTE_CMD) "mkdir -p $(TARGET)"

public/social/bg5.png

421 KB
Loading

src/components/SocialMediaSponsorCard.astro

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,26 @@ import { sponsorLogos } from "@data/sponsorLogos";
44
const { sponsor } = Astro.props;
55
const {
66
name: title,
7+
tier,
78
logo_padding = false,
89
} = sponsor.data;
910
1011
const logo = sponsorLogos[sponsor.id];
1112
13+
const tiers = [
14+
"Keystone",
15+
"Diamond",
16+
"Platinum",
17+
"Platinum X",
18+
"Gold",
19+
"Silver",
20+
"Bronze",
21+
"Patron",
22+
] as const;
23+
24+
const bg_url = tiers.includes(tier)? '/social/bg4.png' : '/social/bg5.png';
25+
26+
1227
// Function to parse CSS padding values
1328
function parsePadding(paddingStr: string) {
1429
if (!paddingStr || paddingStr === "0") {
@@ -65,7 +80,7 @@ const y = 650 - (height + padding.top + padding.bottom) / 2 + padding.top;
6580
---
6681

6782
<svg class="bg" width="900" height="900" class="h-full w-full -z-10">
68-
<image href="/social/bg4.png" width="900" height="900" />
83+
<image href={bg_url} width="900" height="900" />
6984
</svg>
7085

7186
<svg class="sponsor-logo" width="900" height="900">

src/content/sponsors/picnic/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
name: "Picnic"
3-
url: "https://picnic.wiki"
3+
url: "https://jobs.picnic.app/en/home"
44
location: "Germany"
55
industry: "Grocery Delivery"
66
description:

src/data/links.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@
198198
{
199199
"name": "Jobs",
200200
"path": "/jobs"
201+
},
202+
{
203+
"name": "Discord",
204+
"path": "https://discord.com/invite/BhTN2zJPMh"
201205
}
202206
]
203207
},

src/layouts/Layout.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ footer {
8989

9090
@media screen and (width>1200px){
9191
main {
92-
margin-bottom:800px;
92+
margin-bottom:90vh;
9393
}
9494
footer {
9595
position: fixed;
File renamed without changes.

0 commit comments

Comments
 (0)