Skip to content

Commit

Permalink
Updated versions of mdbook and Node to 16 (#97)
Browse files Browse the repository at this point in the history
* Updated versions of mdbook and Node to 16

* Updated dependencies

* Fixed clippy warning

* Removed override wasm-opt code to test

* Removed the separate wasm-opt code now that it's not needed

* Fixed alignment on Firefox

* Updated lock file
  • Loading branch information
tkmcmaster authored Jul 19, 2022
1 parent 24b677f commit 154445c
Show file tree
Hide file tree
Showing 15 changed files with 514 additions and 549 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ FROM rust:1.52
# https://github.com/EmbarkStudios/cargo-deny/releases
ARG CARGO_DENY_VER=0.12.1
# https://github.com/rust-lang/mdBook/releases
ARG MDBOOK_VER=v0.4.18
ARG MDBOOK_VER=v0.4.20
# https://github.com/rustwasm/wasm-pack/releases
ARG WASM_PACK_VER=v0.10.3
# https://nodejs.org/
ARG NODE_MAJOR_VER=14
ARG NODE_MAJOR_VER=16

ARG USER=pewpew

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
- name: Add Node.js toolchain
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x

- name: Build Results Viewer and Book
run: |
set -x
# install mdbook and wasm-pack
mkdir ~/bin
PATH=$PATH:~/bin
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.18/mdbook-v0.4.18-x86_64-unknown-linux-gnu.tar.gz \
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.20/mdbook-v0.4.20-x86_64-unknown-linux-gnu.tar.gz \
| tar -xz -C ~/bin
curl -sSL https://github.com/rustwasm/wasm-pack/releases/download/v0.10.3/wasm-pack-v0.10.3-x86_64-unknown-linux-musl.tar.gz \
| tar -xz --strip-components=1 -C ~/bin --no-anchored wasm-pack
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,13 @@ jobs:
| tar -xz --strip-components=1 -C ~/bin --no-anchored wasm-pack
wasm-pack build --release -t nodejs --scope fs
WASM_FILE_FIXED="${WASM_FILE//-/_}"
wget -O /tmp/binaryen-version_90-x86-linux.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_90/binaryen-version_90-x86-linux.tar.gz
tar -xvf /tmp/binaryen-version_90-x86-linux.tar.gz -C /tmp
/tmp/binaryen-version_90/wasm-opt pkg/${WASM_FILE_FIXED} -o pkg/${WASM_FILE_FIXED} -Oz
working-directory: ${{env.wasm-directory}}
shell: bash

- name: Use Node.js 14.x
- name: Use Node.js 16.x
uses: actions/setup-node@v2
with:
node-version: 14.x
node-version: 16.x
- name: Install Dependencies
run: npm ci
working-directory: ${{env.test-directory}}
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,6 @@ jobs:

- name: Compress for Linux
run: |
wget -O /tmp/binaryen-version_90-x86-linux.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_90/binaryen-version_90-x86-linux.tar.gz
tar -xvf /tmp/binaryen-version_90-x86-linux.tar.gz -C /tmp
/tmp/binaryen-version_90/wasm-opt config_wasm_bg.wasm -o config_wasm_bg.wasm -Oz
asset_name="pewpew-$VERSION-config-wasm.tar.xz"
echo "ASSET_NAME=$asset_name" >> $GITHUB_ENV
XZ_OPT=-9 tar -C ./ -cJf $asset_name package.json config*
Expand Down Expand Up @@ -316,9 +313,6 @@ jobs:

- name: Compress for Linux
run: |
wget -O /tmp/binaryen-version_90-x86-linux.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_90/binaryen-version_90-x86-linux.tar.gz
tar -xvf /tmp/binaryen-version_90-x86-linux.tar.gz -C /tmp
/tmp/binaryen-version_90/wasm-opt hdr_histogram_wasm_bg.wasm -o hdr_histogram_wasm_bg.wasm -Oz
asset_name="pewpew-$VERSION-hdr-histogram-wasm.tar.xz"
echo "ASSET_NAME=$asset_name" >> $GITHUB_ENV
XZ_OPT=-9 tar -C ./ -cJf $asset_name package.json hdr*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-guide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
- name: Add Node.js toolchain
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x

- name: Build Results Viewer and Book
run: |
set -x
# install mdbook and wasm-pack
mkdir ~/bin
PATH=$PATH:~/bin
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.18/mdbook-v0.4.18-x86_64-unknown-linux-gnu.tar.gz \
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.20/mdbook-v0.4.20-x86_64-unknown-linux-gnu.tar.gz \
| tar -xz -C ~/bin
curl -sSL https://github.com/rustwasm/wasm-pack/releases/download/v0.10.3/wasm-pack-v0.10.3-x86_64-unknown-linux-musl.tar.gz \
| tar -xz --strip-components=1 -C ~/bin --no-anchored wasm-pack
Expand Down
Loading

0 comments on commit 154445c

Please sign in to comment.