Skip to content

Commit d332edd

Browse files
authored
Merge branch '2.0' into update-script
2 parents 32f3378 + eb3905c commit d332edd

File tree

9 files changed

+2563
-1090
lines changed

9 files changed

+2563
-1090
lines changed

.github/workflows/beta_deploy.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy beta to Netlify
1+
name: Deploy beta to Cloudflare
22

33
on:
44
# Trigger the workflow every time you push to the `main` branch
@@ -18,27 +18,19 @@ jobs:
1818
build-deploy:
1919
runs-on: ubuntu-latest
2020
steps:
21-
2221
- name: Checkout your repository using git
2322
uses: actions/checkout@v4
24-
25-
- name: Install, build, and upload your site output
26-
env:
27-
NODE_OPTIONS: "--max_old_space_size=4096"
28-
uses: withastro/action@v2
23+
- name: Setup Node.js
24+
uses: actions/setup-node@v4
2925
with:
30-
node-version: 22
31-
32-
- name: Deploy to Netlify
33-
uses: nwtgck/actions-netlify@v3.0
26+
node-version: '22'
27+
- name: Install dependencies
28+
run: npm ci
29+
- name: Build website
30+
run: npm run build
31+
- name: Deploy to Cloudflare Workers
32+
uses: cloudflare/wrangler-action@v3
3433
with:
35-
publish-dir: './dist'
36-
production-branch: "2.0"
37-
github-token: ${{ secrets.GITHUB_TOKEN }}
38-
deploy-message: "Deploy from GitHub Actions"
39-
enable-pull-request-comment: false
40-
enable-commit-comment: false
41-
overwrites-pull-request-comment: false
42-
env:
43-
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
44-
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
34+
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
35+
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
36+
environment: beta

.github/workflows/deploy.yml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,15 @@ permissions:
1515
id-token: write
1616

1717
jobs:
18-
build:
18+
build-deploy:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout your repository using git
2222
uses: actions/checkout@v4
23-
- name: Install, build, and upload your site output
24-
env:
25-
NODE_OPTIONS: "--max_old_space_size=4096"
26-
uses: withastro/action@v2
27-
28-
deploy:
29-
needs: build
30-
runs-on: ubuntu-latest
31-
environment:
32-
name: github-pages
33-
url: ${{ steps.deployment.outputs.page_url }}
34-
steps:
35-
- name: Deploy to GitHub Pages
36-
id: deployment
37-
uses: actions/deploy-pages@v4
23+
- name: Build website
24+
run: npm run build
25+
- name: Deploy to Cloudflare Workers
26+
uses: cloudflare/wrangler-action@v3
27+
with:
28+
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
29+
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,5 @@ translator/
2929
public/p5.min.js
3030

3131
# optional local preferences for vscode
32-
local.code-workspace
32+
local.code-workspace
33+
.zed

0 commit comments

Comments
 (0)