From eada40526b7bd25cb43f86cdf68664319fd48203 Mon Sep 17 00:00:00 2001 From: 9names <60134748+9names@users.noreply.github.com> Date: Mon, 9 Dec 2024 08:58:52 +1100 Subject: [PATCH] Ci fixes (#96) * Use locked versions of build dependencies * Update svdtools to 0.3.20 to avoid type inference error * Correctly indent multiline string * Revert to svd2rust 0.32.0 --- svd/rp2040.yaml | 8 ++++---- update.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/svd/rp2040.yaml b/svd/rp2040.yaml index 982f49c5b..425660d8e 100644 --- a/svd/rp2040.yaml +++ b/svd/rp2040.yaml @@ -5,22 +5,22 @@ DMA: _modify: "CHAIN_TO": description: "When this channel completes, it will trigger the channel indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this channel)_. \\n - Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." + Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." CH0_AL1_CTRL: _modify: "CHAIN_TO": description: "When this channel completes, it will trigger the channel indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this channel)_. \\n - Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." + Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." CH0_AL2_CTRL: _modify: "CHAIN_TO": description: "When this channel completes, it will trigger the channel indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this channel)_. \\n - Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." + Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." CH0_AL3_CTRL: _modify: "CHAIN_TO": description: "When this channel completes, it will trigger the channel indicated by CHAIN_TO. Disable by setting CHAIN_TO = _(this channel)_. \\n - Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." + Reset value is 0, which means for channels 1 and above the default will be to chain to channel 0 - set this field to avoid this behaviour." "CH*_CTRL*": "TREQ_SEL": diff --git a/update.sh b/update.sh index d07489d44..184c750f2 100755 --- a/update.sh +++ b/update.sh @@ -5,11 +5,11 @@ SVDTOOLS="${SVDTOOLS:-svdtools}" set -ex -cargo install --version 0.32.0 svd2rust -cargo install --version 0.11.1 form +cargo install --version 0.32.0 svd2rust --locked +cargo install --version 0.12.1 form --locked rustup component add rustfmt if [ "$SVDTOOLS" == "svdtools" ]; then - cargo install --version 0.3.12 svdtools + cargo install --version 0.3.20 svdtools --locked else python3 -mvenv --clear .venv source .venv/bin/activate