Skip to content

Commit 041a66d

Browse files
authored
fix(general): Revert cat-ci bump which breaks the build (#620)
* fix(general): Revert cat-ci bump which breaks the build * fix(docs): Further revert cat-ci to last actual working version. * fix(rust): revert deny.toml to match cat-ci
1 parent 3032539 commit 041a66d

File tree

10 files changed

+19
-15
lines changed

10 files changed

+19
-15
lines changed

Earthfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.26 AS mdlint-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.26 AS cspell-ci
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.26 AS python-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/mdlint:v3.5.17 AS mdlint-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cspell:v3.5.17 AS cspell-ci
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.17 AS python-ci
66
IMPORT github.com/input-output-hk/catalyst-ci:v3.5.17 AS cat-ci
77

88
FROM debian:stable-slim

docs/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.26 AS docs-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.17 AS docs-ci
44

55
IMPORT .. AS repo
66

docs/src/architecture/08_concepts/catalyst_voting/cddl/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.26 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

docs/src/architecture/08_concepts/immutable_ledger/cddl/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.26 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

docs/src/architecture/08_concepts/signed_doc/cddl/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.26 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

rust/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.5.26 AS rust-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/rust:v3.5.17 AS rust-ci
44
IMPORT ../ AS repo-ci
55

66
COPY_SRC:

rust/deny.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ allow-git = [
6363
"https://github.com/input-output-hk/mithril",
6464
# Maintained fork of an archived crates-io version.
6565
"https://github.com/dariusc93/rust-ipfs",
66-
# TODO(dt-iohk): remove this when changes from forked flutter_rust_bridge are merged into the official version
67-
"https://github.com/input-output-hk/catalyst_flutter_rust_bridge",
6866
]
6967

7068
[licenses]
@@ -111,6 +109,7 @@ crate = "ring"
111109
expression = "MIT"
112110
license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
113111

112+
114113
# SPDX considers OpenSSL to encompass both the OpenSSL and SSLeay licenses
115114
# https://spdx.org/licenses/OpenSSL.html
116115
# ISC - Both BoringSSL and ring use this for their new files

specs/Earthfile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.26 AS python-ci
4-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/debian:v3.5.26 AS debian
5-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cue:v3.5.26 AS cue
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/python:v3.5.17 AS python-ci
4+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/debian:v3.5.17 AS debian
5+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cue:v3.5.17 AS cue
66

77
IMPORT ../docs AS docs
88

@@ -65,6 +65,11 @@ regenerate-local:
6565
check:
6666
FROM +src
6767
RUN cue fmt --check --diff -s --files ./definitions
68+
69+
# Make sure we can regenerate the same signed doc json
70+
COPY +regenerate/signed_doc.json signed_doc_regenerated.json
71+
RUN diff -u signed_doc_regenerated.json signed_doc.json
72+
6873
# RUN cd definitions; \
6974
# cue vet ./cddl
7075
RUN cd definitions; \

specs/generators/pages/signed_doc/cddl/Earthfile.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.26 AS cddl-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/cddl:v3.5.17 AS cddl-ci
44

55
check-cddl:
66
FROM cddl-ci+cddl-base

utilities/docs-preview/Earthfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION 0.8
22

3-
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.26 AS docs-ci
3+
IMPORT github.com/input-output-hk/catalyst-ci/earthly/docs:v3.5.17 AS docs-ci
44

55
# update-docs-dev-script: get the latest docs dev script from CI.
66
update-docs-dev-script:

0 commit comments

Comments
 (0)