Skip to content

Commit 556c20c

Browse files
authored
Merge branch 'ep2025' into ep2025-issue-1126
2 parents aaaf45d + 1de7c00 commit 556c20c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1303
-598
lines changed

.github/workflows/build-deploy.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ on:
55
push:
66
branches:
77
- ep2025
8+
schedule:
9+
- cron: "0 * * * *"
810

911
jobs:
1012
deploy:
@@ -32,7 +34,7 @@ jobs:
3234
run: make install
3335

3436
- name: Build the website
35-
run: make build
37+
run: make build MODE=production
3638

3739
- name: Set up SSH key
3840
uses: webfactory/[email protected]

.github/workflows/preview.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,21 @@ jobs:
3232
- name: Install dependencies
3333
run: make install
3434

35+
- name: Get current branch name
36+
run: |
37+
BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
38+
echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
39+
3540
- name: Build the website
36-
run: make build PREVIEW=true
41+
run:
42+
make build MODE=preview
43+
SITE_URL="https://${BRANCH_NAME}.ep-preview.click"
3744

3845
- name: Set up SSH key
3946
uses: webfactory/[email protected]
4047
with:
4148
ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
4249

43-
- name: Get current branch name
44-
run: |
45-
BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
46-
echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
47-
4850
- name: ssh keyscan
4951
run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
5052

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ build:
2020
commands:
2121
- npm install -g pnpm@latest-10
2222
- make install
23-
- make build PREVIEW=true
23+
- make build MODE=preview SITE_URL=$READTHEDOCS_CANONICAL_URL
2424
- mkdir -p $READTHEDOCS_OUTPUT/html
2525
- cd dist && cp -r * $READTHEDOCS_OUTPUT/html

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ VPS_HOST ?= static.europython.eu
66
VPS_PROD_PATH ?= /home/static_content_user/content/europython_websites/ep2025
77
VPS_PREVIEW_PATH ?= /home/static_content_user/content/previews
88
REMOTE_CMD=ssh $(VPS_USER)@$(VPS_HOST)
9+
PREVIEW_SITE_URL ?= "https://$(SAFE_BRANCH).ep-preview.click"
910

1011
# Variables for build/deploy
1112
# ==========================
@@ -42,18 +43,19 @@ check:
4243
pnpm run astro check
4344

4445
build:
45-
pnpm build
46+
pnpm run astro build --mode $(MODE)
4647

4748
preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
4849
preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
4950
preview:
50-
@echo "Preview site URL: $(SITE_URL)" # Output preview URL
51+
@echo "Preview site URL: $(PREVIEW_SITE_URL)"
5152
echo $(TARGET)
5253
@echo "\n\n**** Deploying preview of a branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
5354
$(REMOTE_CMD) "mkdir -p $(TARGET)"
5455
rsync -avz --delete ./dist/ $(VPS_USER)@$(VPS_HOST):$(TARGET)/
5556
$(REMOTE_CMD) "cd $(RELEASES_DIR) && ln -snf $(TIMESTAMP) current"
5657
@echo "\n\n**** Preview complete.\n\n"
58+
@echo "Open the preview site at: $(PREVIEW_SITE_URL)\n\n"
5759

5860

5961
ifeq ($(FORCE_DEPLOY), true)

astro.config.mjs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,8 @@ export default defineConfig({
5353
},
5454
site: process.env.SITE_URL || "https://ep2025.europython.eu",
5555
redirects: {
56-
"/c-api-summit/": "/programme/c-api-summit/",
57-
"/cfp/": "/programme/cfp/",
5856
"/planning/": "https://forms.gle/riw6CvML8ck94A4V9",
5957
"/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18",
60-
"/rust-summit/": "/programme/rust-summit/",
61-
"/sponsor/": "/sponsorship/sponsor/",
62-
"/voting/": "/programme/voting/",
63-
"/wasm-summit/": "/programme/wasm-summit/",
64-
"/sessions/": "/programme/sessions/",
65-
"/explore": "/prague",
66-
"/where": "/venue",
6758
},
6859
integrations: [
6960
preload(),

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@astrojs/sitemap": "^3.3.0",
1919
"@astrojs/tailwind": "^5.1.4",
2020
"@fontsource-variable/inter": "^5.1.1",
21+
"@fortawesome/fontawesome-free": "^6.7.2",
2122
"@tailwindcss/typography": "^0.5.16",
2223
"@types/react": "^19.1.0",
2324
"@types/react-dom": "^19.1.1",

pnpm-lock.yaml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/hr.png

419 Bytes
Loading

public/icons/bluesky.svg

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

public/icons/instagram.svg

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

0 commit comments

Comments
 (0)