From 453ccc49b190c9d35e3d85e2f032b5df0bf253c8 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 16 Nov 2023 16:02:18 +0100 Subject: [PATCH 1/4] CI: Add workflow to publish web-demo to `gh-pages` branch on each PR --- .github/workflows/deploy_web_demo.yml | 62 +++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/deploy_web_demo.yml diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml new file mode 100644 index 00000000000..cb2dd605b94 --- /dev/null +++ b/.github/workflows/deploy_web_demo.yml @@ -0,0 +1,62 @@ +name: Deploy web demo + +on: [push, pull_request] + +# TODO: run only on master +# on: +# # Runs on pushes targeting the default branch +# push: +# branches: ["master"] + +# # Allows you to run this workflow manually from the Actions tab +# workflow_dispatch: + +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + target: wasm32-unknown-unknown + toolchain: 1.70.0 + override: true + + - uses: Swatinem/rust-cache@v2 + with: + prefix-key: "web-demo-" + + - uses: jetli/wasm-bindgen-action@v0.2.0 + + - run: | + scripts/build_demo_web.sh --release + + - name: Setup Pages + uses: actions/configure-pages@v3 + + - name: Upload artifact + uses: actions/upload-pages-artifact@v2 + with: + path: "docs" + + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v2 From 576ea8d493aa14f8cd4649464070ce00ac29479b Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 16 Nov 2023 16:04:52 +0100 Subject: [PATCH 2/4] setup_web.sh already installes wasm-bindgen --- .github/workflows/deploy_web_demo.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml index cb2dd605b94..da36161e931 100644 --- a/.github/workflows/deploy_web_demo.yml +++ b/.github/workflows/deploy_web_demo.yml @@ -44,8 +44,6 @@ jobs: with: prefix-key: "web-demo-" - - uses: jetli/wasm-bindgen-action@v0.2.0 - - run: | scripts/build_demo_web.sh --release From 489271735979acec94ea7954c9b0b0ffe48f03c1 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 16 Nov 2023 16:11:47 +0100 Subject: [PATCH 3/4] Install wasm-opt and set the correct flags --- .github/workflows/deploy_web_demo.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml index da36161e931..aa7abbc11bd 100644 --- a/.github/workflows/deploy_web_demo.yml +++ b/.github/workflows/deploy_web_demo.yml @@ -11,10 +11,11 @@ on: [push, pull_request] # # Allows you to run this workflow manually from the Actions tab # workflow_dispatch: +# Grant GITHUB_TOKEN the permissions required to make a Pages deployment permissions: contents: read - pages: write - id-token: write + pages: write # to deploy to Pages + id-token: write # to verify the deployment originates from an appropriate source # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. @@ -22,12 +23,23 @@ concurrency: group: "pages" cancel-in-progress: false +env: + # web_sys_unstable_apis is required to enable the web_sys clipboard API which eframe web uses, + # as well as by the wasm32-backend of the wgpu crate. + # https://rustwasm.github.io/wasm-bindgen/api/web_sys/struct.Clipboard.html + # https://rustwasm.github.io/docs/wasm-bindgen/web-sys/unstable-apis.html + RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings + RUSTDOCFLAGS: -D warnings + jobs: # Single deploy job since we're just deploying deploy: + name: Deploy web demo + environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest steps: - name: Checkout @@ -44,6 +56,10 @@ jobs: with: prefix-key: "web-demo-" + - name: "Install wasmopt / binaryen" + run: | + sudo apt-get update && sudo apt-get install binaryen + - run: | scripts/build_demo_web.sh --release From 1f76f3387986ec78c3a8f39d5bfbd0559491b08d Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 16 Nov 2023 16:18:10 +0100 Subject: [PATCH 4/4] Only run on m,erges to `master` --- .github/workflows/deploy_web_demo.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml index aa7abbc11bd..c1efe513487 100644 --- a/.github/workflows/deploy_web_demo.yml +++ b/.github/workflows/deploy_web_demo.yml @@ -1,15 +1,12 @@ name: Deploy web demo -on: [push, pull_request] +on: + # We only run this on merges to master + push: + branches: ["master"] -# TODO: run only on master -# on: -# # Runs on pushes targeting the default branch -# push: -# branches: ["master"] - -# # Allows you to run this workflow manually from the Actions tab -# workflow_dispatch: + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: # Grant GITHUB_TOKEN the permissions required to make a Pages deployment permissions: