Skip to content

Commit

Permalink
Revert "Force Rust cache for GitHub workflow to cddl version 0.9.1" (#…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
whimboo authored Dec 14, 2023
1 parent 9ddaeb4 commit 1935bea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ jobs:
with:
node-version: 16
- name: Get cddl version
# Remove strict version requirement here and in the test script
# once the CLI command works again.
# See: https://github.com/anweiss/cddl/issues/213
# 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
run: echo "0.9.1" > cddl.txt
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
- name: "Cache rust binaries"
uses: actions/cache@v3
id: cache-cddl
Expand Down
8 changes: 4 additions & 4 deletions index.bs
Original file line number Diff line number Diff line change
Expand Up @@ -6443,7 +6443,7 @@ used to send custom messages from the [=remote end=] to the [=local end=].

[=Remote end definition=]

<pre class="cddl remote-cddl">
<pre class="cddl remote-cddl local-cddl">
script.ChannelValue = {
type: "channel",
value: script.ChannelProperties,
Expand Down Expand Up @@ -6591,7 +6591,7 @@ a previously serialized <code>script.RemoteValue</code> during

[=Remote end definition=]

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

[=Remote end definition=]

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

[=Remote end definition=]

<pre class="cddl remote-cddl">
<pre class="cddl remote-cddl local-cddl">
script.SerializationOptions = {
? maxDomDepth: (js-uint / null) .default 0,
? maxObjectDepth: (js-uint / null) .default null,
Expand Down
5 changes: 1 addition & 4 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ ROOT="$(dirname "$SCRIPT_DIR")"

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

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

0 comments on commit 1935bea

Please sign in to comment.