Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

30: remove anvil from pages build #36

Merged
merged 1 commit into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading