Skip to content

Commit 1935bea

Browse files
authored
Revert "Force Rust cache for GitHub workflow to cddl version 0.9.1" (#622)
* Revert "Force Rust cache for GitHub workflow to cddl version 0.9.1" This reverts commit 9ddaeb4 because a new cddl 0.9.4 release with the fix is out. * Revert "Restrict cddl to version 0.9.1 because of broken cli command" This reverts commit 1d58e92. * Expose certain CDDl types in local cddl as well.
1 parent 9ddaeb4 commit 1935bea

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ jobs:
2424
with:
2525
node-version: 16
2626
- name: Get cddl version
27-
# Remove strict version requirement here and in the test script
28-
# once the CLI command works again.
29-
# See: https://github.com/anweiss/cddl/issues/213
30-
# run: curl -s https://crates.io/api/v1/crates/cddl | python3 -c "import sys, json; print(json.load(sys.stdin)['crate']['max_stable_version'])" | tee cddl.txt
31-
run: echo "0.9.1" > cddl.txt
27+
run: curl -s https://crates.io/api/v1/crates/cddl | python3 -c "import sys, json; print(json.load(sys.stdin)['crate']['max_stable_version'])" | tee cddl.txt
3228
- name: "Cache rust binaries"
3329
uses: actions/cache@v3
3430
id: cache-cddl

index.bs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6443,7 +6443,7 @@ used to send custom messages from the [=remote end=] to the [=local end=].
64436443

64446444
[=Remote end definition=]
64456445

6446-
<pre class="cddl remote-cddl">
6446+
<pre class="cddl remote-cddl local-cddl">
64476447
script.ChannelValue = {
64486448
type: "channel",
64496449
value: script.ChannelProperties,
@@ -6591,7 +6591,7 @@ a previously serialized <code>script.RemoteValue</code> during
65916591

65926592
[=Remote end definition=]
65936593

6594-
<pre class="cddl remote-cddl">
6594+
<pre class="cddl remote-cddl local-cddl">
65956595
script.LocalValue = (
65966596
script.RemoteReference /
65976597
script.PrimitiveProtocolValue /
@@ -7198,7 +7198,7 @@ The <code>script.RealmType</code> type represents the different types of Realm.
71987198

71997199
[=Remote end definition=]
72007200

7201-
<pre class="cddl remote-cddl">
7201+
<pre class="cddl remote-cddl local-cddl">
72027202
<!-- This is specifically ordered in the order in which matches need to be -->
72037203
<!-- evaluated, since the definitions are overlapping -->
72047204
script.RemoteReference = (
@@ -8020,7 +8020,7 @@ ownership will be treated.
80208020

80218021
[=Remote end definition=]
80228022

8023-
<pre class="cddl remote-cddl">
8023+
<pre class="cddl remote-cddl local-cddl">
80248024
script.SerializationOptions = {
80258025
? maxDomDepth: (js-uint / null) .default 0,
80268026
? maxObjectDepth: (js-uint / null) .default null,

scripts/test.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ ROOT="$(dirname "$SCRIPT_DIR")"
66

77
if ! [ -x "$(command -v cddl)" ] || [ "$1" = "--upgrade" ]; then
88
echo 'Installing cddl'
9-
# Remove strict version requirement here and for the Rust cache
10-
# once the CLI command works again.
11-
# See: https://github.com/anweiss/cddl/issues/213
12-
cargo install cddl --version 0.9.1
9+
cargo install cddl
1310
fi
1411

1512
if [[ "$(npm list parse5)" =~ "empty" ]] || [ "$1" = "--upgrade" ]; then

0 commit comments

Comments
 (0)