Merge branch 'unstable' into fix-makefile

sigp · Nov 1, 2024 · 79a3040 · 79a3040
2 parents 387553e + 67545c4
commit 79a3040
Show file tree

Hide file tree

Showing 23 changed files with 6,792 additions and 936 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -124,8 +124,10 @@ jobs:
       run: git diff --exit-code Cargo.lock
     - name: Run cargo audit
       run: make audit-CI
-    - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
-      run:  CARGO_HOME=$(readlink -f $HOME) make vendor
+      # Dependency conflicts are causing pain here. Once SLOG is removed from lighthouse this should
+      # be re-enabled
+      # - name: Run cargo vendor to make sure dependencies can be vendored for packaging, reproducibility and archival purpose
+      #run:  CARGO_HOME=$(readlink -f $HOME) make vendor
     - name: Markdown-linter
       run: make mdlint
   check-msrv: