Skip to content

Commit

Permalink
Fix workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Joffref committed May 14, 2023
1 parent f86f3b5 commit eb75fb0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/go-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@ jobs:
uses: actions/setup-go@v2
with:
go-version: 1.20
- name: Set up Rust
uses: actions/setup-rust@v1
- name: Install latest nightly Rust
uses: actions-rs/toolchain@v1
with:
rust-version: stable
toolchain: nightly
override: true
components: rustfmt, clippy
- name: Set up WASM target
run: rustup target add wasm32-unknown-unknown
- name: test
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/rust-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up Rust
uses: actions/setup-rust@v1
- name: Install latest nightly Rust
uses: actions-rs/toolchain@v1
with:
rust-version: stable
toolchain: nightly
override: true
components: rustfmt, clippy
- name: test
run: make rust-test
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ rust-test: rust-dependencies
cd $(PROJECT_DIR)/lib && cargo test

wasm:
cd lib && cargo build --target wasm32-unknown-unknown --release
cd $(PROJECT_DIR)/lib && cargo build --target wasm32-unknown-unknown --release
mkdir -p $(PROJECT_DIR)/pkg/cedar/static
cp lib/target/wasm32-unknown-unknown/release/cedar-wasm.wasm $(PROJECT_DIR)/static/cedar.wasm
cp $(PROJECT_DIR)/lib/target/wasm32-unknown-unknown/release/cedarwasm.wasm $(PROJECT_DIR)/static/cedar.wasm

build: dependencies wasm

2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]

name = "cedar-wasm"
name = "cedarwasm"
description = "Cedar Policy exported to WebAssembly for use in go"
edition = "2021"
version = "1.0.0"
Expand Down

0 comments on commit eb75fb0

Please sign in to comment.