Skip to content

Commit

Permalink
Fix emsdk build setup failure
Browse files Browse the repository at this point in the history
Upstream emsdk changed the setup scripts, which breaks v4 of the setup-emsdk action.

See mymindstorm/setup-emsdk#7.
  • Loading branch information
lopopolo committed Jul 21, 2020
1 parent 6e625b0 commit 660ef0f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions-rs/clippy-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --all-features
args: --workspace --all-features

ruby:
name: Lint and format Ruby
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,17 @@ jobs:
run: sudo apt-get install bison

- name: Cache emsdk
uses: actions/cache@v1
uses: actions/cache@v2
id: cache
with:
path: "emsdk-cache"
key: emscripten-emsdk-${{ runner.os }}-emsdk-${{ steps.toolchain_versions.outputs.emscripten }}

- name: Install Emscripten toolchain
uses: mymindstorm/setup-emsdk@v4
uses: mymindstorm/setup-emsdk@v6
with:
version: ${{ steps.toolchain_versions.outputs.emscripten }}
actions-cache-folder: "emsdk-cache"
no-cache: true

- name: Verify emcc version
run: emcc -v
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace :lint do
roots.each do |root|
FileUtils.touch(root)
end
sh 'cargo clippy'
sh 'cargo clippy --workspace --all-features'
end

desc 'Run RuboCop'
Expand Down

0 comments on commit 660ef0f

Please sign in to comment.