Skip to content

Commit

Permalink
30: remove anvil from pages build
Browse files Browse the repository at this point in the history
 - move abi to root of lib
 - disable incremental build for ci
  • Loading branch information
jac18281828 committed Jan 20, 2024
1 parent d4bd7a3 commit 8030963
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ jobs:
push: false
build-args: |
VERSION=latest
CARGO_INCREMENTAL=0
14 changes: 8 additions & 6 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
name: GitHub Pages

on:
push:
workflow_run:
workflows: ["Build Dev Image CI"]
branches: ["main"]
types:
- completed
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
Expand Down Expand Up @@ -37,12 +40,11 @@ jobs:
profile: minimal
override: true

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Run tests
env:
CARGO_INCREMENTAL: 0
run: |
cargo test
cargo test --workspace --all-features --tests tests
id: test

- name: Invoke cargo doc
Expand Down
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
{
"label": "test",
"type": "shell",
"command": "cargo test",
"command": "cargo test --workspace --all-features --no-fail-fast",
"options": {
"cwd": "${workspaceFolder}"
},
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ghcr.io/xmtp/rust:latest

ARG CARGO_INCREMENTAL
ARG PROJECT=didethresolver
WORKDIR /workspaces/${PROJECT}

Expand All @@ -14,6 +14,7 @@ COPY --from=ghcr.io/xmtp/foundry:latest /usr/local/bin/anvil /usr/local/bin/anvi

COPY --chown=xmtp:xmtp . .

ENV CARGO_INCREMENTAL=${CARGO_INCREMENTAL:-1}
RUN cargo fmt --check --all
RUN cargo clippy --all-features --no-deps -- -D warnings
RUN cargo test --workspace --all-features
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/src/resolver/did_registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pub use self::did_registry::*;

abigen!(
DIDRegistry,
"./src/abi/DIDRegistry.json",
"./abi/DIDRegistry.json",
derives(serde::Serialize, serde::Deserialize)
);

Expand Down

0 comments on commit 8030963

Please sign in to comment.