Skip to content

Commit 084ce8f

Browse files
Merge branch 'ep2025' into ep2025-sprints
2 parents 8cb2373 + e1da437 commit 084ce8f

File tree

81 files changed

+1136
-431
lines changed

Some content is hidden

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

81 files changed

+1136
-431
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)"

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"@astro-community/astro-embed-youtube": "^0.5.6",
1515
"@astrojs/check": "^0.9.4",
1616
"@astrojs/mdx": "^4.3.0",
17-
"@astrojs/sitemap": "^3.4.0",
17+
"@astrojs/sitemap": "^3.4.1",
1818
"@astrojs/svelte": "^7.0.13",
1919
"@astrojs/ts-plugin": "^1.10.4",
2020
"@fortawesome/fontawesome-free": "^6.7.2",
2121
"@nanostores/persistent": "^1.0.0",
2222
"@tailwindcss/typography": "^0.5.16",
23-
"@tailwindcss/vite": "^4.1.8",
23+
"@tailwindcss/vite": "^4.1.11",
2424
"astro": "^5.8.0",
2525
"astro-compress": "^2.3.8",
2626
"astro-delete-unused-images": "^1.0.3",
@@ -34,14 +34,14 @@
3434
"hastscript": "^9.0.1",
3535
"js-yaml": "^4.1.0",
3636
"lite-youtube-embed": "^0.3.3",
37-
"marked": "^15.0.12",
37+
"marked": "^16.0.0",
3838
"nanostores": "^1.0.1",
3939
"pagefind": "^1.3.0",
4040
"rehype-autolink-headings": "^7.1.0",
4141
"rehype-slug": "^6.0.0",
4242
"remark-toc": "^9.0.0",
4343
"sharp": "^0.34.2",
44-
"svelte": "^5.33.12",
44+
"svelte": "^5.34.9",
4545
"tailwindcss": "^4.1.8",
4646
"typescript": "^5.8.3",
4747
"vite": "^6.3.5"
@@ -51,7 +51,7 @@
5151
"prettier": "^3.5.3",
5252
"prettier-plugin-astro": "^0.14.1",
5353
"puppeteer": "^24.9.0",
54-
"tsx": "^4.19.4",
54+
"tsx": "^4.20.3",
5555
"typescript": "^5.8.3"
5656
},
5757
"prettier": {

0 commit comments

Comments
 (0)