ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix silly mistakes in previous CI.yml PRs (#988)

Browse Source 
* Fix silly mistakes in previous CI.yml PRs

This is what happens when I code before my morning matcha

Part of #987
This commit is contained in:
Adam Chalmers
2023-11-02 12:34:38 -05:00
committed by GitHub
parent 1189f272ba
commit 37a65b166b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ci.yml vendored
View File

@ -157,7 +157,8 @@ jobs:
MODE: ${{ (github.event_name == 'release' || github.event_name == 'schedule') && '--release' || '--debug' }} MODE: ${{ (github.event_name == 'release' || github.event_name == 'schedule') && '--release' || '--debug' }}
run: | run: |
mkdir src/wasm-lib/pkg; cd src/wasm-lib mkdir src/wasm-lib/pkg; cd src/wasm-lib
npx wasm-pack build --target web --out-dir pkg $DEBUG_OR_RELEASE ${{ env.MODE }} echo "building with ${{ env.MODE }}"
npx wasm-pack build --target web --out-dir pkg ${{ env.MODE }}
cd ../../ cd ../../
cp src/wasm-lib/pkg/wasm_lib_bg.wasm public cp src/wasm-lib/pkg/wasm_lib_bg.wasm public
@ -207,8 +208,8 @@ jobs:
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }} APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
with: with:
includeDebug: ${{ github.event_name == 'release' || github.event_name == 'schedule' }} includeRelease: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
includeRelease: ${{ github.event_name != 'release' && github.event_name != 'schedule' }} includeDebug: ${{ github.event_name != 'release' && github.event_name != 'schedule' }}
args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }} args: ${{ matrix.os == 'macos-latest' && '--target universal-apple-darwin' || '' }}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
@ -225,6 +226,8 @@ jobs:
- name: Run e2e tests - name: Run e2e tests
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: xvfb-run yarn test:e2e run: xvfb-run yarn test:e2e
env:
MODE: ${{ (github.event_name == 'release' || github.event_name == 'schedule') && 'release' || 'debug' }}
typos: typos:
runs-on: ubuntu-latest runs-on: ubuntu-latest

5
wdio.conf.js
View File

@ -2,11 +2,14 @@ const os = require('os')
const path = require('path') const path = require('path')
const { spawn } = require('child_process') const { spawn } = require('child_process')
// keep track of the `tauri-driver` child process // keep track of the `tauri-driver` child process
let tauriDriver let tauriDriver
const mode = process.env.MODE
const application = const application =
process.env.E2E_APPLICATION || './src-tauri/target/release/kittycad-modeling' process.env.E2E_APPLICATION || `./src-tauri/target/${mode}/kittycad-modeling`
exports.config = { exports.config = {
port: 4444, port: 4444,