30: remove anvil from pages build

 - move abi to root of lib
 - disable incremental build for ci

Author: jac18281828

.github/workflows/ci-image.yml

@@ -31,3 +31,4 @@ jobs:
           push: false
           build-args: |
             VERSION=latest
+            CARGO_INCREMENTAL=0

.github/workflows/github-pages.yml

@@ -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
@@ -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

.vscode/tasks.json

@@ -57,7 +57,7 @@
         {
             "label": "test",
             "type": "shell",
-            "command": "cargo test",
+            "command": "cargo test --workspace --all-features --no-fail-fast",
             "options": {
                 "cwd": "${workspaceFolder}"
             },

Dockerfile

@@ -1,5 +1,5 @@
 FROM ghcr.io/xmtp/rust:latest
-
+ARG CARGO_INCREMENTAL
 ARG PROJECT=didethresolver
 WORKDIR /workspaces/${PROJECT}
 
@@ -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

lib/src/abi/DIDRegistry.json lib/abi/DIDRegistry.json

@@ -6,7 +6,7 @@ pub use self::did_registry::*;
 
 abigen!(
     DIDRegistry,
-    "./src/abi/DIDRegistry.json",
+    "./abi/DIDRegistry.json",
     derives(serde::Serialize, serde::Deserialize)
 );