feat(general): Bumping cat-ci version to v3.2.13 (#38)

* bump cat-ci version

* intentionally break the test

* add .secret.template update gitignore

* wip

* fix

* try

* try

* prune cache for rust/+build target

* try

* try

* try

* try

* try

* disable caching for build

* try new version

* fix(rust): test (#40)

* fix(rust): Add --keep-ts like the original cache fix had.  Also, use a common builder.

* refactor(rust): Move FINGERPRINT_SRC to the common rust definitions in cat-ci

* fix(rust): Remove deliberate cache break

* ci(general): Bump to latest CI release with updated rust builders

* remove failed test

* add failing test again

* disable caching for build target

* Revert "disable caching for build target"

This reverts commit 3c77acb.

* fix(rust): Try Rust cache fix

* fix(rust): remove broken unit test test

* test(rust): Put the failing unit test test back

* fix(rust): Bump to cat-ci v3.2.12

* remove failed test

* Change advisories to warnings, because they randomly break CI and we can't control them.

* fix(rust): Use v3.2.13 of cat-ci

---------

Co-authored-by: Steven Johnson <[email protected]>
Co-authored-by: Steven Johnson <[email protected]>

Author: Mr-Leshiy

.gitignore

@@ -1,3 +1,6 @@
+## Secrets
+**/.secret
+
 ### Linux ###
 *~
 

.secret.template

@@ -0,0 +1 @@
+GITHUB_TOKEN=Make One at https://github.com/settings/tokens only need public repo, read packages permissions

Earthfile

@@ -1,7 +1,7 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.05 AS mdlint-ci
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.05 AS cspell-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.2.13 AS mdlint-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.2.13 AS cspell-ci
 
 FROM debian:stable-slim
 

docs/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.05 AS docs-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.2.13 AS docs-ci
 
 IMPORT .. AS repo
 

rust/Earthfile

@@ -1,6 +1,19 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.05 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.2.13 AS rust-ci
+
+COPY_SRC:
+    FUNCTION
+
+    COPY --keep-ts --dir \
+        Cargo.toml clippy.toml deny.toml rustfmt.toml \
+        .cargo .config \
+        c509-certificate \
+        cardano-chain-follower \
+        catalyst-voting \
+        cbork cbork-abnf-parser cbork-cddl-parser \
+        hermes-ipfs \
+        .
 
 # sync-cfg: Synchronize local config with CI version.
 # Must be run by the developer manually.
@@ -9,27 +22,31 @@ sync-cfg:
 
 # builder : Set up our target toolchains, and copy our files.
 builder:
-    DO rust-ci+SETUP
-
-    COPY Cargo.toml clippy.toml deny.toml rustfmt.toml .
-    COPY --dir .cargo .config \
-                c509-certificate \
-                cardano-chain-follower \
-                catalyst-voting \
-                cbork \
-                cbork-abnf-parser \
-                cbork-cddl-parser \
-                hermes-ipfs .
+    DO rust-ci+SETUP 
+
+builder-src:
+    FROM +builder
+
+    # Don't build the src in the home directory itself, because it contains stuff.
+    WORKDIR $HOME/build
+    RUN rm -rf *
+
+    # Cached copy of the source we build.
+    DO +COPY_SRC
+
+    # Generate Checksums of the source
+    DO rust-ci+FINGERPRINT_SRC
+    SAVE ARTIFACT ../src_fingerprint.txt 
 
 # check : Run basic check.
 check:
-    FROM +builder
+    FROM +builder-src
 
     DO rust-ci+EXECUTE --cmd="/scripts/std_checks.py"
 
 # build : Build crates.
 build:
-    FROM +builder
+    FROM +builder-src
 
     DO rust-ci+EXECUTE \
         --cmd="/scripts/std_build.py" \
@@ -43,6 +60,28 @@ build:
     SAVE ARTIFACT target/$TARGETARCH/doc doc
     SAVE ARTIFACT target/release/cbork cbork
 
+# build-src-check: Check for any caching issues with the source we are building against.
+check-builder-src-cache:
+    FROM +builder
+
+    # Don't build the src in the home directory itself, because it contains stuff.
+    WORKDIR $HOME/build
+    RUN rm -rf *
+
+    COPY +builder-src/src_fingerprint.txt ..
+
+    RUN --no-cache echo "Cache Disabled"
+
+    # Uncached copy of the source we build.
+    DO +COPY_SRC
+
+    # Generate Checksums of the source
+    DO rust-ci+FINGERPRINT_SRC --FINGERPRINT=src_fingerprint_uncached.txt
+
+    RUN diff ../src_fingerprint.txt ../src_fingerprint_uncached.txt \
+        || (echo "ERROR: Source fingerprints do not match. Caching Error Detected!!" && exit 1) \
+        && echo "Source fingerprints match. Caching OK."
+
 
 # local-ci-run: This step simulates the full CI run for local purposes only.
 local-ci-run:

rust/Justfile

@@ -17,7 +17,7 @@ sync-cfg:
 
 # Check Dependency licenses and CVE's
 license-check:
-    cargo deny check --exclude-dev
+    cargo deny check --exclude-dev -W vulnerability
 
 # Format the rust code
 code-format:

rust/c509-certificate/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.05 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.13 AS rust-ci
 
 IMPORT .. AS rust-local
 IMPORT ../.. AS repo

rust/cbork/Earthfile

@@ -1,6 +1,6 @@
 VERSION 0.8
 
-IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.05 AS rust-ci
+IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust::v3.2.13 AS rust-ci
 
 IMPORT .. AS rust-local