FIX: Fix paths in docker builds (#491)

* FIX: Fix paths in docker builds

* CI: Why is the job skipped...

* FIX: Remove .filter

* FIX: Filter non-crates

* BUILD: Enable binding build by default. Move source trigger to fendermint

.dockerignore

@@ -0,0 +1,4 @@
+target
+fendermint/builtin-actors
+contracts/cache
+contracts/node-modules

.github/workflows/ci.yaml

@@ -56,7 +56,7 @@ jobs:
     uses: ./.github/workflows/contracts-prettier.yaml
     needs: [changes]
     if: >-
-      needs.changes.filter.outputs.contracts == 'true' ||
+      needs.changes.outputs.contracts == 'true' ||
       github.ref == 'refs/heads/main'
 
   contracts-test:
@@ -79,32 +79,32 @@ jobs:
     uses: ./.github/workflows/fvm-utils.yaml
     needs: [changes, license]
     if: >-
-      needs.changes.filter.outputs.fvm-utils == 'true' ||
+      needs.changes.outputs.fvm-utils == 'true' ||
       github.ref == 'refs/heads/main'
 
   ipc:
     uses: ./.github/workflows/ipc.yaml
     needs: [changes, license]
     if: >-
-      needs.changes.filter.outputs.contracts == 'true' ||
-      needs.changes.filter.outputs.ipc == 'true' ||
+      needs.changes.outputs.contracts == 'true' ||
+      needs.changes.outputs.ipc == 'true' ||
       github.ref == 'refs/heads/main'
 
   ipld-resolver:
     uses: ./.github/workflows/ipld-resolver.yaml
     needs: [changes, license]
     if: >-
-      needs.changes.filter.outputs.ipld-resolver == 'true' ||
+      needs.changes.outputs.ipld-resolver == 'true' ||
       github.ref == 'refs/heads/main'
 
   fendermint-test:
     uses: ./.github/workflows/fendermint-test.yaml
     needs: [changes, license]
     if: >-
-      needs.changes.filter.outputs.contracts == 'true' ||
-      needs.changes.filter.outputs.ipc == 'true' ||
-      needs.changes.filter.outputs.ipld-resolver == 'true' ||
-      needs.changes.filter.outputs.fendermint == 'true' ||
+      needs.changes.outputs.contracts == 'true' ||
+      needs.changes.outputs.ipc == 'true' ||
+      needs.changes.outputs.ipld-resolver == 'true' ||
+      needs.changes.outputs.fendermint == 'true' ||
       github.ref == 'refs/heads/main'
 
   fendermint-publish:

contracts/.gitignore

@@ -4,7 +4,6 @@ crytic-export/
 .vscode
 .idea
 .env
-.gen
 broadcast/
 out/
 

contracts/Makefile

@@ -7,8 +7,6 @@ NETWORK ?= auto
 # It is required by docker builds, but shouldn't be checked into git.
 OUTPUT ?= out
 
-IPC_ACTORS_CODE := $(shell find . -type f \( -name "*.sol" \))
-
 deploy-ipc:
 	./ops/deploy.sh $(NETWORK)
 
@@ -36,7 +34,7 @@ compile-abi: | forge
 	./ops/compile-abi.sh $(OUTPUT)
 
 rust-binding:
-	OUTPUT=$(OUTPUT) BUILD_BINDINGS=1 cargo build --locked --release --manifest-path ./binding/Cargo.toml -p ipc_actors_abis
+	OUTPUT=$(OUTPUT) cargo build --locked --release --manifest-path ./binding/Cargo.toml -p ipc_actors_abis
 
 # commit-abi:
 # 	./ops/commit-abi.sh $(OUTPUT)

fendermint/.gitignore

@@ -6,3 +6,4 @@ cometbft
 test-network
 .idea
 .make
+.contracts-gen

fendermint/Makefile

@@ -5,7 +5,8 @@ BUILTIN_ACTORS_BUNDLE := $(PWD)/builtin-actors/output/bundle.car
 
 IPC_ACTORS_DIR        := $(PWD)/../contracts
 IPC_ACTORS_OUT        := $(IPC_ACTORS_DIR)/out
-IPC_ACTORS_GEN				:= $(IPC_ACTORS_DIR)/.gen
+IPC_ACTORS_CODE       := $(shell find $(IPC_ACTORS_DIR) -type f \( -name "*.sol" \))
+IPC_ACTORS_GEN				:= .contracts-gen
 
 FENDERMINT_CODE       := $(shell find . -type f \( -name "*.rs" -o -name "Cargo.toml" \) | grep -v target)
 
@@ -33,7 +34,7 @@ install: $(IPC_ACTORS_GEN)
 	cargo install --locked --path fendermint/app
 
 # Using --release for testing because wasm can otherwise be slow.
-test: $(BUILTIN_ACTORS_BUNDLE) $(IPC_ACTORS_OUT) $(IPC_ACTORS_GEN)
+test: $(BUILTIN_ACTORS_BUNDLE) $(IPC_ACTORS_GEN)
 	FM_BUILTIN_ACTORS_BUNDLE=$(BUILTIN_ACTORS_BUNDLE) \
 	FM_CONTRACTS_DIR=$(IPC_ACTORS_OUT) \
 	cargo test --release --package 'fendermint_*'
@@ -73,14 +74,14 @@ docker-build: docker-deps $(FENDERMINT_CODE)
 			$(BUILDX_STORE) \
 			$(BUILDX_FLAGS) \
 			-f docker/Dockerfile \
-			-t $(BUILDX_TAG) $(PWD); \
+			-t $(BUILDX_TAG) $(PWD)/..; \
 	else \
 		cat docker/builder.local.Dockerfile docker/runner.Dockerfile > docker/Dockerfile ; \
 		DOCKER_BUILDKIT=1 \
 		docker build \
 			$(BUILDX_STORE) \
 			-f docker/Dockerfile \
-			-t fendermint:latest $(PWD); \
+			-t fendermint:latest $(PWD)/..; \
 	fi
 
 
@@ -94,11 +95,10 @@ $(BUILTIN_ACTORS_BUNDLE):
 	mkdir -p $(dir $@)
 	curl -L -o $@ https://github.com/filecoin-project/builtin-actors/releases/download/$(BUILTIN_ACTORS_TAG)/builtin-actors-mainnet.car
 
-# Generate the ABI artifacts if we don't have them already.
-$(IPC_ACTORS_GEN):
-		cd $(IPC_ACTORS_DIR) && make .gen
-
-$(IPC_ACTORS_OUT): $(IPC_ACTORS_GEN)
+# Regenerate the ABI artifacts if we don't have them already, or they changed.
+$(IPC_ACTORS_GEN): $(IPC_ACTORS_CODE)
+		cd $(IPC_ACTORS_DIR) && make compile-abi
+		touch $@
 
 .PHONY: protoc
 protoc:

fendermint/docker/builder.ci.Dockerfile

@@ -12,16 +12,16 @@ FROM --platform=$BUILDPLATFORM ubuntu:latest as stripper
 
 WORKDIR /app
 
-# Copy the Cargo artifacts and Rust sources.
+# Copy the Cargo artifacts and Rust sources everything; even though we only need Cargo.* artifacts and Rust sources.
 COPY Cargo.toml Cargo.lock ./
-COPY fendermint fendermint/
+COPY . .
 
 # Delete anything other than cargo files: Rust sources, config files, Markdown, etc.
-RUN find fendermint -type f \! -name "Cargo.*" | xargs rm -rf
+RUN find . -type f \! -name "Cargo.*" | xargs rm -rf
 
 # Construct dummy sources. Add a print to help debug the case if we failed to properly replace the file.
-RUN echo "fn main() { println!(\"I'm the dummy.\"); }" > fendermint/app/src/main.rs && \
-  for crate in $(find fendermint -name "Cargo.toml" | xargs dirname); do \
+RUN echo "fn main() { println!(\"I'm the dummy.\"); }" > fendermint/fendermint/app/src/main.rs && \
+  for crate in $(find . -name "Cargo.toml" | xargs dirname | grep -v infra | grep -v node_modules | grep /); do \
   touch $crate/src/lib.rs; \
   done
 
@@ -76,12 +76,12 @@ RUN set -eux; \
 COPY . .
 
 # Need to invalidate build caches otherwise they won't be recompiled with the real code.
-RUN find fendermint -type f \( -wholename "**/src/lib.rs" -o -wholename "**/src/main.rs" \) | xargs touch
+RUN find . -type f \( -wholename "**/src/lib.rs" -o -wholename "**/src/main.rs" \) | xargs touch
 
 # Do the final build.
 RUN set -eux; \
   case "${TARGETARCH}" in \
   amd64) ARCH='x86_64'  ;; \
   arm64) ARCH='aarch64' ;; \
   esac; \
-  cargo install --locked --root output --path fendermint/app --target ${ARCH}-unknown-linux-gnu
+  cargo install --locked --root output --path fendermint/fendermint/app --target ${ARCH}-unknown-linux-gnu

fendermint/docker/builder.local.Dockerfile

@@ -17,4 +17,4 @@ COPY . .
 RUN --mount=type=cache,target=target \
   --mount=type=cache,target=$RUSTUP_HOME,from=rust,source=$RUSTUP_HOME \
   --mount=type=cache,target=$CARGO_HOME,from=rust,source=$CARGO_HOME \
-  cargo install --locked --root output --path fendermint/app
+  cargo install --locked --root output --path fendermint/fendermint/app

fendermint/docker/runner.Dockerfile

@@ -24,7 +24,7 @@ STOPSIGNAL SIGTERM
 ENV FM_ABCI__LISTEN__HOST=0.0.0.0
 ENV FM_ETH__LISTEN__HOST=0.0.0.0
 
-COPY docker/.artifacts/bundle.car $FM_HOME_DIR/bundle.car
-COPY docker/.artifacts/contracts $FM_HOME_DIR/contracts
+COPY fendermint/docker/.artifacts/bundle.car $FM_HOME_DIR/bundle.car
+COPY fendermint/docker/.artifacts/contracts $FM_HOME_DIR/contracts
 COPY --from=builder /app/fendermint/app/config $FM_HOME_DIR/config
 COPY --from=builder /app/output/bin/fendermint /usr/local/bin/fendermint