Fix hashFiles() input for C++ CI caching (#632)

foxglove · Oct 4, 2022 · ac35b82 · ac35b82
1 parent c191848
commit ac35b82
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.conan/data
-          key: ${{ runner.os }}-${{ hashFiles('~/.conan/data') }}
+          key: ${{ runner.os }}-${{ hashFiles('cpp/**/conanfile.py') }}
       - uses: satackey/action-docker-layer-caching@v0.0.11
         continue-on-error: true
       - run: cd cpp && make ci
@@ -183,7 +183,7 @@ jobs:
       - uses: actions/cache@v3
         with:
           path: ~/.conan/data
-          key: ${{ runner.os }}-${{ hashFiles('~/.conan/data') }}
+          key: ${{ runner.os }}-${{ hashFiles('cpp/**/conanfile.py') }}
       - uses: satackey/action-docker-layer-caching@v0.0.11
         continue-on-error: true
       - run: make ci-format-check

diff --git a/cpp/Makefile b/cpp/Makefile
@@ -63,13 +63,13 @@ ci-image: hdoc-build
 
 .PHONY: ci
 ci: ci-image
-	docker run -t --rm -v $(CURDIR):/mcap/cpp mcap_cpp_ci ./build.sh
+	docker run -t --rm -v $(CURDIR):/mcap/cpp -v $(HOME)/.conan/data:/root/.conan/data mcap_cpp_ci ./build.sh
 
 .PHONY: ci-docs
 ci-docs: ci-image
 	docker build -t mcap_cpp_ci_jammy -f ci.Dockerfile .
-	docker run -t --rm -v $(CURDIR):/mcap/cpp -v $(CURDIR)/../__docs__/cpp:/hdoc-output mcap_cpp_ci_jammy ./build-docs.sh
+	docker run -t --rm -v $(CURDIR):/mcap/cpp -v $(CURDIR)/../__docs__/cpp:/hdoc-output -v $(HOME)/.conan/data:/root/.conan/data mcap_cpp_ci_jammy ./build-docs.sh
 
 .PHONY: ci-format-check
 ci-format-check: ci-image
-	docker run -t --rm -v $(CURDIR):/mcap/cpp mcap_cpp_ci python3 scripts/format.py .
+	docker run -t --rm -v $(CURDIR):/mcap/cpp -v $(HOME)/.conan/data:/root/.conan/data mcap_cpp_ci python3 scripts/format.py .