diff --git a/.github/workflows/check-tutorial.yaml b/.github/workflows/check-tutorial.yaml index 11722d8904d..bf259d0cce2 100644 --- a/.github/workflows/check-tutorial.yaml +++ b/.github/workflows/check-tutorial.yaml @@ -38,6 +38,8 @@ jobs: expectedCardanoNodeVersion = re.findall(r"supportedCardanoNodeVersion.*([0-9]+\.[0-9]+\.[0-9]+)", body)[0] print("Checking used cardano-node version") + print(usedCardanoNodeVersions) + print(expectedCardanoNodeVersion) if all(v == expectedCardanoNodeVersion for v in usedCardanoNodeVersions): print(" PASS ✓") else: @@ -63,6 +65,8 @@ jobs: knownMithrilEndpoints = re.findall(r"Aggregator endpoint.*\((http[^\)]*)", preprodSection) print("Checking mithril aggregator endpoints") + print(usedMithrilEndpoints) + print(knownMithrilEndpoints) if all(v in set(knownMithrilEndpoints) for v in usedMithrilEndpoints): print(" PASS ✓") else: diff --git a/docs/docs/tutorial/index.md b/docs/docs/tutorial/index.md index 509788bb7d5..f804d253fff 100644 --- a/docs/docs/tutorial/index.md +++ b/docs/docs/tutorial/index.md @@ -31,14 +31,14 @@ After ensuring the tools above are available, begin by downloading pre-built bin ```shell mkdir -p bin -version=0.18.0 +hydra_version=0.18.0 mithril_version=2428.0 -node_version=9.1.0 -curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${version}/hydra-x86_64-linux-${version}.zip -unzip -d bin hydra-x86_64-linux-${version}.zip -curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${node_version}/cardano-node-${node_version}-linux.tar.gz -tar xf cardano-node-${node_version}-linux.tar.gz ./bin/cardano-node ./bin/cardano-cli -tar xf cardano-node-${node_version}-linux.tar.gz ./share/preprod --strip-components=3 +cardano_node_version=9.1.0 +curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-x86_64-linux-${hydra_version}.zip +unzip -d bin hydra-x86_64-linux-${hydra_version}.zip +curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-linux.tar.gz +tar xf cardano-node-${cardano_node_version}-linux.tar.gz ./bin/cardano-node ./bin/cardano-cli +tar xf cardano-node-${cardano_node_version}-linux.tar.gz ./share/preprod --strip-components=3 curl -L -o - https://github.com/input-output-hk/mithril/releases/download/${mithril_version}/mithril-${mithril_version}-linux-x64.tar.gz \ | tar xz -C bin mithril-client chmod +x bin/* @@ -49,14 +49,14 @@ chmod +x bin/* ```shell mkdir -p bin -version=0.18.0 +hydra_version=0.18.0 mithril_version=2428.0 -node_version=9.1.0 -curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${version}/hydra-aarch64-darwin-${version}.zip -unzip -d bin hydra-aarch64-darwin-${version}.zip -curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${node_version}/cardano-node-${node_version}-macos.tar.gz -tar xf cardano-node-${node_version}-macos.tar.gz --wildcards ./bin/cardano-node ./bin/cardano-cli './bin/*.dylib' -tar xf cardano-node-${node_version}-macos.tar.gz ./share/preprod --strip-components=3 +cardano_node_version=9.1.0 +curl -L -O https://github.com/cardano-scaling/hydra/releases/download/${hydra_version}/hydra-aarch64-darwin-${hydra_version}.zip +unzip -d bin hydra-aarch64-darwin-${hydra_version}.zip +curl -L -O https://github.com/IntersectMBO/cardano-node/releases/download/${cardano_node_version}/cardano-node-${cardano_node_version}-macos.tar.gz +tar xf cardano-node-${cardano_node_version}-macos.tar.gz --wildcards ./bin/cardano-node ./bin/cardano-cli './bin/*.dylib' +tar xf cardano-node-${cardano_node_version}-macos.tar.gz ./share/preprod --strip-components=3 curl -L -o - https://github.com/input-output-hk/mithril/releases/download/${mithril_version}/mithril-${mithril_version}-macos-x64.tar.gz \ | tar xz -C bin chmod +x bin/* @@ -381,13 +381,13 @@ Start the `hydra-node` using these parameters: ```shell -version=0.18.0 +hydra_version=0.18.0 hydra-node \ --node-id "alice-node" \ --persistence-dir persistence-alice \ --cardano-signing-key credentials/alice-node.sk \ --hydra-signing-key credentials/alice-hydra.sk \ - --hydra-scripts-tx-id $(curl https://raw.githubusercontent.com/cardano-scaling/hydra/master/networks.json | jq -r ".preprod.\"${version}\"") \ + --hydra-scripts-tx-id $(curl https://raw.githubusercontent.com/cardano-scaling/hydra/master/networks.json | jq -r ".preprod.\"${hydra_version}\"") \ --ledger-protocol-parameters protocol-parameters.json \ --testnet-magic 1 \ --node-socket node.socket \ @@ -404,13 +404,13 @@ hydra-node \ ```shell -version=0.18.0 +hydra_version=0.18.0 hydra-node \ --node-id "bob-node" \ --persistence-dir persistence-bob \ --cardano-signing-key credentials/bob-node.sk \ --hydra-signing-key credentials/bob-hydra.sk \ - --hydra-scripts-tx-id $(curl https://raw.githubusercontent.com/cardano-scaling/hydra/master/networks.json | jq -r ".preprod.\"${version}\"") \ + --hydra-scripts-tx-id $(curl https://raw.githubusercontent.com/cardano-scaling/hydra/master/networks.json | jq -r ".preprod.\"${hydra_version}\"") \ --ledger-protocol-parameters protocol-parameters.json \ --testnet-magic 1 \ --node-socket node.socket \ diff --git a/release.sh b/release.sh index 48e960b8c8c..18502f0b38a 100755 --- a/release.sh +++ b/release.sh @@ -72,7 +72,7 @@ prepare_release() { git tag -as "$version" -F <(changelog "$version") # Make branch release point to tag so that the website is published - git checkout --track origin/release + git checkout release git merge "${version}" --ff-only git checkout master @@ -181,7 +181,7 @@ update_api_version() { update_tutorial_version() { local version="$1" local tutorial_file=docs/docs/tutorial/index.md - sed -i"" -e "s,\(version=\).*,\1$version," $tutorial_file + sed -i"" -e "s,\(hydra_version=\).*,\1$version," $tutorial_file } update_demo_version() {