Skip to content

Commit 56d16ca

Browse files
authoredFeb 2, 2025··
Vue rewrite (#106)
* vue rewrite * Improve tooltip code * Fix compilation visuals and debug overlay overflow * Fix error reporting * Working deploy and networking improvements * CI and README updates * readme tuning and ci check * Hopefully final fixes * fix pages build paths * Hopefully fix pages build again * Remove unused dependency * Fix reflection view not being scrollable * Fixed inconsistent loading in dev environment * Ensure tooltips can overflow
1 parent b799891 commit 56d16ca

Some content is hidden

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

58 files changed

+5128
-1775
lines changed
 
+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
# Provides builds of slang and spirv-tools for the website
2+
name: Build Dependencies
3+
4+
on:
5+
# Allows you to run this workflow manually from the Actions tab
6+
workflow_dispatch:
7+
8+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
9+
permissions:
10+
contents: read
11+
pages: write
12+
id-token: write
13+
14+
jobs:
15+
# Build job
16+
build:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- name: Checkout
20+
uses: actions/checkout@v4
21+
22+
- name: get slang head commit
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install -y ninja-build
26+
mkdir slang-repo
27+
pushd slang-repo
28+
git clone https://github.com/shader-slang/slang.git
29+
popd
30+
echo "$(git -C slang-repo/slang rev-parse HEAD)" >> key.txt
31+
32+
- name: get spirv-tool head commit
33+
run: |
34+
git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
35+
pushd spirv-tools
36+
git checkout vulkan-sdk-1.3.290.0
37+
popd
38+
echo "$(git -C spirv-tools rev-parse HEAD)" >> key-spirv-tool.txt
39+
40+
- name: slang-wasm build
41+
run: |
42+
sed -i -e 's/\r$//' ./slang-wasm-build.sh
43+
chmod +x ./slang-wasm-build.sh
44+
./slang-wasm-build.sh
45+
46+
- name: spirv-tools-wasm build
47+
run: |
48+
sed -i -e 's/\r$//' ./spirv-tool-wasm-build.sh
49+
chmod +x ./spirv-tool-wasm-build.sh
50+
./spirv-tool-wasm-build.sh
51+
52+
- name: Cleanup workspace, move files, and build
53+
run: |
54+
rm -rf slang-repo
55+
rm -rf emsdk
56+
rm -rf spirv-tools
57+
mkdir dependencies
58+
mv ./slang-wasm.wasm.gz ./slang-wasm.js ./slang-wasm.d.ts ./dependencies/
59+
mv ./spirv-tools.wasm ./spirv-tools.js ./spirv-tools.d.ts ./dependencies/
60+
61+
- name: Upload export artifact
62+
uses: actions/upload-artifact@v4
63+
with:
64+
name: site-artifact
65+
path: ./dependencies/
66+
compression-level: 1

‎.github/workflows/jekyll-gh-pages.yml

+6-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# Sample workflow for building and deploying a Jekyll site to GitHub Pages
2-
name: Deploy Jekyll with GitHub Pages dependencies preinstalled
1+
name: Deploy to GitHub Pages
32

43
on:
54
# Runs on pushes targeting the default branch
@@ -102,33 +101,21 @@ jobs:
102101
./spirv-tools.d.ts
103102
key: ${{hashFiles('key-spirv-tool.txt')}}
104103

105-
- name: Cleanup workspace
104+
- name: Cleanup workspace, move files, and build
106105
run: |
107106
rm -rf slang-repo
108107
rm -rf emsdk
109108
rm -rf spirv-tools
110-
111-
- name: Build typescript
112-
run: |
109+
mv ./slang-wasm.wasm.gz ./slang-wasm.js ./slang-wasm.d.ts ./src/
110+
mv ./spirv-tools.wasm ./spirv-tools.js ./spirv-tools.d.ts ./src/
113111
npm install
114-
npx tsc
115-
116-
- name: Build with Jekyll
117-
uses: actions/jekyll-build-pages@v1
118-
with:
119-
source: ./
120-
destination: ./_site
112+
npm run build
121113
122-
- name: Copy depencencies
123-
run: |
124-
sudo mkdir ./_site/node_modules
125-
sudo cp -r node_modules/requirejs ./_site/node_modules/requirejs
126-
sudo cp -r node_modules/pako ./_site/node_modules/pako
127114
- name: Upload export artifact
128115
uses: actions/upload-artifact@v4
129116
with:
130117
name: site-artifact
131-
path: ./_site/
118+
path: ./dist/
132119
compression-level: 1
133120

134121
# Deployment job

0 commit comments

Comments
 (0)
Please sign in to comment.