|
83 | 83 | id: rewriter-cache |
84 | 84 | with: |
85 | 85 | path: | |
86 | | - rewriter/wasm/out |
87 | | - dist/scramjet.wasm.wasm |
88 | | - key: rewriter-release-${{ hashFiles('rewriter/**/Cargo.toml', 'rewriter/**/*.rs', 'rewriter/**/src/**/*.toml', 'rewriter/**/src/**/*.json', 'rewriter/**/src/**/*.md', 'rewriter/**/*.sh') }} |
| 86 | + packages/scramjet/rewriter/wasm/out |
| 87 | + packages/scramjet/dist/scramjet.wasm.wasm |
| 88 | + key: rewriter-release-${{ hashFiles('packages/scramjet/rewriter/**/Cargo.toml', 'packages/scramjet/rewriter/**/*.rs', 'packages/scramjet/rewriter/**/src/**/*.toml', 'packages/scramjet/rewriter/**/src/**/*.json', 'packages/scramjet/rewriter/**/src/**/*.md', 'packages/scramjet/rewriter/**/*.sh') }} |
89 | 89 | restore-keys: | |
90 | 90 | rewriter-release- |
91 | 91 |
|
@@ -113,22 +113,24 @@ jobs: |
113 | 113 | run: "cargo install --git https://github.com/r58playz/wasm-snip" |
114 | 114 |
|
115 | 115 | - name: Pack Scramjet |
116 | | - run: pnpm pack |
| 116 | + run: | |
| 117 | + cd packages/scramjet |
| 118 | + pnpm pack |
117 | 119 |
|
118 | 120 | - name: Upload Artifact (pnpm pack) |
119 | 121 | uses: actions/upload-artifact@v4 |
120 | 122 | with: |
121 | 123 | name: packaged-scramjet |
122 | | - path: mercuryworkshop-scramjet-*.tgz |
| 124 | + path: packages/scramjet/mercuryworkshop-scramjet-*.tgz |
123 | 125 |
|
124 | 126 | - name: Upload Artifact (dist) |
125 | 127 | uses: actions/upload-artifact@v4 |
126 | 128 | with: |
127 | 129 | name: scramjet |
128 | 130 | path: | |
129 | | - dist/*.js |
130 | | - dist/*.js.map |
131 | | - dist/*.wasm |
| 131 | + packages/scramjet/dist/*.js |
| 132 | + packages/scramjet/dist/*.js.map |
| 133 | + packages/scramjet/dist/*.wasm |
132 | 134 | frontend: |
133 | 135 | name: Build Frontend |
134 | 136 | runs-on: ubuntu-latest |
@@ -156,56 +158,46 @@ jobs: |
156 | 158 | uses: actions/download-artifact@v4 |
157 | 159 | with: |
158 | 160 | name: scramjet |
159 | | - path: dist |
| 161 | + path: packages/scramjet/dist |
160 | 162 |
|
161 | 163 | - name: Build Dreamland |
162 | 164 | run: | |
163 | | - cd dreamlandjs |
| 165 | + cd external/dreamlandjs |
164 | 166 | pnpm build |
165 | 167 |
|
166 | | - - name: Get Chii submodule commit hash |
167 | | - id: chii-hash |
168 | | - run: echo "hash=$(git submodule status chii | awk '{print $1}')" >> $GITHUB_OUTPUT |
169 | | - |
170 | | - - name: Cache Chii build output |
171 | | - id: chii-cache |
172 | | - uses: actions/cache@v4 |
173 | | - with: |
174 | | - path: | |
175 | | - chii/public |
176 | | - chii/front_end/dist |
177 | | - key: chii-${{ runner.os }}-${{ steps.chii-hash.outputs.hash }} |
178 | | - |
179 | | - - name: Install Depot Tools |
180 | | - if: steps.chii-cache.outputs.cache-hit != 'true' |
181 | | - |
182 | | - |
183 | | - - name: Initialize Chii front_end |
184 | | - if: steps.chii-cache.outputs.cache-hit != 'true' |
185 | | - run: | |
186 | | - cd chii |
187 | | - pnpm init:front_end |
188 | | -
|
189 | | - - name: Build Chii |
190 | | - if: steps.chii-cache.outputs.cache-hit != 'true' |
191 | | - run: | |
192 | | - cd chii |
193 | | - pnpm build |
194 | | -
|
195 | | - - name: Build Chobitsu |
196 | | - run: | |
197 | | - cd chobitsu |
198 | | - pnpm webpack build --mode development |
199 | | -
|
200 | | - - name: Build page_inject |
201 | | - run: | |
202 | | - cd page_inject |
203 | | - npx rollup -c |
| 168 | + # - name: Get Chii submodule commit hash |
| 169 | + # id: chii-hash |
| 170 | + # run: echo "hash=$(git submodule status chii | awk '{print $1}')" >> $GITHUB_OUTPUT |
| 171 | + |
| 172 | + # - name: Cache Chii build output |
| 173 | + # id: chii-cache |
| 174 | + # uses: actions/cache@v4 |
| 175 | + # with: |
| 176 | + # path: | |
| 177 | + # chii/public |
| 178 | + # chii/front_end/dist |
| 179 | + # key: chii-${{ runner.os }}-${{ steps.chii-hash.outputs.hash }} |
| 180 | + |
| 181 | + # - name: Install Depot Tools |
| 182 | + # if: steps.chii-cache.outputs.cache-hit != 'true' |
| 183 | + |
| 184 | + |
| 185 | + # - name: Initialize Chii front_end |
| 186 | + # if: steps.chii-cache.outputs.cache-hit != 'true' |
| 187 | + # run: | |
| 188 | + # cd chii |
| 189 | + # pnpm init:front_end |
| 190 | + |
| 191 | + # - name: Build Chii |
| 192 | + # if: steps.chii-cache.outputs.cache-hit != 'true' |
| 193 | + # run: | |
| 194 | + # cd chii |
| 195 | + # pnpm build |
204 | 196 |
|
205 | 197 | - name: Build Frontend |
206 | 198 | run: | |
207 | | - cd frontend |
208 | | - pnpm vite build |
| 199 | + pnpm build |
| 200 | + VITE_ISOLATION_ORIGIN="https://puter.zone" pnpm build:chrome |
209 | 201 | tests: |
210 | 202 | name: Run Scramjet Tests |
211 | 203 | runs-on: ubuntu-latest |
|
0 commit comments