Skip to content

Commit

Permalink
Merge branch 'main' into vc-mvp-update
Browse files Browse the repository at this point in the history
  • Loading branch information
nmattia committed Oct 30, 2023
2 parents 14dba88 + 2757b03 commit 2b1fc6b
Show file tree
Hide file tree
Showing 17 changed files with 516 additions and 360 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,14 @@ jobs:
run: |
cargo clippy -- -D clippy::all -D warnings -A clippy::manual_range_contains
cargo clippy --tests --benches -- -D clippy::all -D warnings -A clippy::manual_range_contains
check-lockfile:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/bootstrap

- name: Cargo Lockfile Check
# fails if lockfile is out of date
# https://users.rust-lang.org/t/check-if-the-cargo-lock-is-up-to-date-without-building-anything/91048/5
run: cargo update --workspace --locked
2 changes: 1 addition & 1 deletion .ic-commit
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# the commit used to pull the state machine executable
# see rust canister tests for more info
2e3589427cd9648d4edaebc1b96b5daf8fdd94d8
dc09a9c339a6250e1d4a6b851903b995270dff96
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ ARG II_INSECURE_REQUESTS=
# DFX specific metadata for dfx deps
ARG DFX_METADATA=

RUN touch src/internet_identity/src/lib.rs
RUN touch src/internet_identity_interface/src/lib.rs
RUN touch src/canister_tests/src/lib.rs
RUN touch src/*/src/lib.rs
RUN npm ci

RUN ./scripts/build ${DFX_METADATA:+"--dfx-metadata" "$DFX_METADATA"}
Expand All @@ -97,9 +95,7 @@ FROM deps as build_archive

COPY . .

RUN touch src/internet_identity_interface/src/lib.rs
RUN touch src/archive/src/lib.rs
RUN touch src/canister_tests/src/lib.rs
RUN touch src/*/src/lib.rs

RUN ./scripts/build --archive
RUN sha256sum /archive.wasm.gz
Expand Down
Loading

0 comments on commit 2b1fc6b

Please sign in to comment.