Skip to content

Commit

Permalink
Update dependencies20230327 (#115)
Browse files Browse the repository at this point in the history
* Updated Cargo dependencies for OpenSSL Vulnerability

* Fixed clippy warnings

* Added MacOS11 Github tests

* Updated ResultsViewer dependencies

* Removed the old Svelte Results Viewer

* Removed the legacy Svelte results-viewer from PRs and scripts

* Added script for testing the command line
  • Loading branch information
tkmcmaster authored Mar 28, 2023
1 parent 9e493aa commit 161c05b
Show file tree
Hide file tree
Showing 24 changed files with 2,887 additions and 21,479 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/pr-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,13 @@ jobs:
# setup some envs to various paths for convenience
PROJECT_ROOT=$PWD
GUIDE_DIR=$(realpath $PROJECT_ROOT/guide)
RESULTS_VIEWER_DIR=$(realpath $GUIDE_DIR/results-viewer)
RESULTS_VIEWER_REACT_DIR=$(realpath $GUIDE_DIR/results-viewer-react)
WASM_LIB_DIR=$(realpath $PROJECT_ROOT/lib/hdr-histogram-wasm)
WASM_OUTPUT_DIR=$RESULTS_VIEWER_DIR/lib/hdr-histogram-wasm
WASM_OUTPUT_REACT_DIR=$RESULTS_VIEWER_REACT_DIR/lib/hdr-histogram-wasm
# build the hdr-histogram-wasm for the results viewer
cd $WASM_LIB_DIR
wasm-pack build --release -t web -d $WASM_OUTPUT_DIR --scope fs
wasm-pack build --release -t bundler -d $WASM_OUTPUT_REACT_DIR --scope fs
cd $WASM_OUTPUT_DIR
sed -i 's/input = .*import\.meta\.url.*/import(".\/hdr_histogram_wasm_bg.wasm");\n input = require.resolve(".\/hdr_histogram_wasm_bg.wasm")[0][0];/' hdr_histogram_wasm.js
# build the results viewer (which includes putting the output into the book's src)
cd $RESULTS_VIEWER_DIR
npm ci
npm run build
cd $RESULTS_VIEWER_REACT_DIR
npm ci
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Test Suite
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
os: [ubuntu-latest, windows-latest, macos-latest, macos-11]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand Down
10 changes: 0 additions & 10 deletions .github/workflows/update-guide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,13 @@ jobs:
# setup some envs to various paths for convenience
PROJECT_ROOT=$PWD
GUIDE_DIR=$(realpath $PROJECT_ROOT/guide)
RESULTS_VIEWER_DIR=$(realpath $GUIDE_DIR/results-viewer)
RESULTS_VIEWER_REACT_DIR=$(realpath $GUIDE_DIR/results-viewer-react)
WASM_LIB_DIR=$(realpath $PROJECT_ROOT/lib/hdr-histogram-wasm)
WASM_OUTPUT_DIR=$RESULTS_VIEWER_DIR/lib/hdr-histogram-wasm
WASM_OUTPUT_REACT_DIR=$RESULTS_VIEWER_REACT_DIR/lib/hdr-histogram-wasm
# build the hdr-histogram-wasm for the results viewer
cd $WASM_LIB_DIR
wasm-pack build --release -t web -d $WASM_OUTPUT_DIR --scope fs
wasm-pack build --release -t bundler -d $WASM_OUTPUT_REACT_DIR --scope fs
cd $WASM_OUTPUT_DIR
sed -i 's/input = .*import\.meta\.url.*/import(".\/hdr_histogram_wasm_bg.wasm");\n input = require.resolve(".\/hdr_histogram_wasm_bg.wasm")[0][0];/' hdr_histogram_wasm.js
# build the results viewer (which includes putting the output into the book's src)
cd $RESULTS_VIEWER_DIR
npm ci
npm run build
cd $RESULTS_VIEWER_REACT_DIR
npm ci
Expand Down
Loading

0 comments on commit 161c05b

Please sign in to comment.