Skip to content

Commit 9fade84

Browse files
committed
Merge branch 'astro'
* astro: Disable build on branch Bump dependencies Move CNAME into public
2 parents 22fe48c + 59fdbc2 commit 9fade84

File tree

4 files changed

+66
-46
lines changed

4 files changed

+66
-46
lines changed

.github/workflows/actions.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ name: GitHub Actions
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- master
77
push:
88
branches:
9-
- main
10-
- astro # TODO: remove
9+
- master
1110
schedule:
1211
# Rebuild every day to update dynamic content
1312
- cron: '0 0 * * *'
@@ -26,7 +25,7 @@ jobs:
2625
- run: npm run check
2726
- run: npm run build
2827
- name: Upload Artifact
29-
# if: github.ref == 'refs/heads/main'
28+
if: github.ref == 'refs/heads/master'
3029
uses: actions/upload-pages-artifact@v3
3130
with:
3231
path: './dist'

package-lock.json

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
},
2323
"dependencies": {
2424
"@astrojs/rss": "^4.0.11",
25-
"@astrojs/sitemap": "^3.3.0",
25+
"@astrojs/sitemap": "^3.4.0",
2626
"@astrolib/seo": "^1.0.0-beta.8",
2727
"@fontsource-variable/inter": "^5.2.5",
28-
"astro": "^5.7.3",
28+
"astro": "^5.8.0",
2929
"astro-embed": "^0.9.0",
3030
"astro-icon": "^1.1.5",
3131
"limax": "4.1.0",
@@ -34,9 +34,9 @@
3434
},
3535
"devDependencies": {
3636
"@astrojs/check": "^0.9.4",
37-
"@astrojs/mdx": "^4.2.4",
37+
"@astrojs/mdx": "^4.3.0",
3838
"@astrojs/partytown": "^2.1.4",
39-
"@astrojs/tailwind": "^5.1.5",
39+
"@astrojs/tailwind": "^6.0.2",
4040
"@eslint/js": "^9.24.0",
4141
"@iconify-json/flat-color-icons": "^1.2.1",
4242
"@iconify-json/tabler": "^1.2.17",
File renamed without changes.

0 commit comments

Comments
 (0)