From 827df62287915af6f600327230400cd503aa434e Mon Sep 17 00:00:00 2001 From: Larry Kittinger Date: Thu, 18 Aug 2022 02:37:26 -0400 Subject: [PATCH 1/2] update to new packages and bump version --- scripts/bootstrap_env.sh | 22 +++++++++++----------- src/dune/dune.py | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/bootstrap_env.sh b/scripts/bootstrap_env.sh index cc0fc1fc..b0c2a98a 100644 --- a/scripts/bootstrap_env.sh +++ b/scripts/bootstrap_env.sh @@ -2,25 +2,25 @@ ARCH=`uname -m` -ORG="eosnetworkfoundation" -NODE_VERSION="3.1.0-rc2" -CDT_VERSION="3.0.0-rc1" +ORG="AntelopeIO" +NODE_VERSION="3.1.0-rc4" +CDT_VERSION="3.0.0-rc2" -CONTAINER_PACKAGE=eosnetworkfoundation/experimental-binaries +CONTAINER_PACKAGE=AntelopeIO/experimental-binaries GH_ANON_BEARER=$(curl -s "https://ghcr.io/token?service=registry.docker.io&scope=repository:${CONTAINER_PACKAGE}:pull" | jq -r .token) curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/blobs/$(curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/manifests/v3.1.0-rc2 | jq -r .layers[0].digest) | tar zx if [ "${ARCH}" = "x86_64" ]; then - wget https://github.com/${ORG}/mandel/releases/download/v${NODE_VERSION}/mandel-${NODE_VERSION}-ubuntu20.04-x86_64.deb - apt install ./mandel-${NODE_VERSION}-ubuntu20.04-x86_64.deb - apt install ./mandel-dev-${NODE_VERSION}-ubuntu20.04-x86_64.deb - wget https://github.com/${ORG}/mandel.cdt/releases/download/v${CDT_VERSION}/cdt_${CDT_VERSION}_amd64.deb + wget https://github.com/${ORG}/leap/releases/download/v${NODE_VERSION}/leap-${NODE_VERSION}-ubuntu20.04-x86_64.deb + apt install ./leap-${NODE_VERSION}-ubuntu20.04-x86_64.deb + apt install ./leap-dev-${NODE_VERSION}-ubuntu20.04-x86_64.deb + wget https://github.com/${ORG}/cdt/releases/download/v${CDT_VERSION}/cdt_${CDT_VERSION}_amd64.deb apt install ./cdt_${CDT_VERSION}_amd64.deb else - apt install ./mandel-${NODE_VERSION}-ubuntu20.04-aarch64.deb - apt install ./mandel-dev-${NODE_VERSION}-ubuntu20.04-aarch64.deb - wget https://github.com/${ORG}/mandel.cdt/releases/download/v${CDT_VERSION}/cdt_${CDT_VERSION}_arm64.deb + apt install ./leap-${NODE_VERSION}-ubuntu20.04-aarch64.deb + apt install ./leap-dev-${NODE_VERSION}-ubuntu20.04-aarch64.deb + wget https://github.com/${ORG}/cdt/releases/download/v${CDT_VERSION}/cdt_${CDT_VERSION}_arm64.deb apt install ./cdt_${CDT_VERSION}_arm64.deb fi diff --git a/src/dune/dune.py b/src/dune/dune.py index 580e3cb7..db22eef5 100644 --- a/src/dune/dune.py +++ b/src/dune/dune.py @@ -11,7 +11,7 @@ def version_minor(): def version_patch(): return 0 def version_suffix(): - return "rc1" + return "rc2" def version_full(): return "v"+str(version_major())+"."+str(version_minor())+"."+str(version_patch())+"."+version_suffix() class dune_error(Exception): From ded0afb8cc6200c022848eab5f9c4e153647a34f Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 18 Aug 2022 12:22:21 -0400 Subject: [PATCH 2/2] update version --- scripts/bootstrap_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/bootstrap_env.sh b/scripts/bootstrap_env.sh index b0c2a98a..5d007f94 100644 --- a/scripts/bootstrap_env.sh +++ b/scripts/bootstrap_env.sh @@ -9,7 +9,7 @@ CDT_VERSION="3.0.0-rc2" CONTAINER_PACKAGE=AntelopeIO/experimental-binaries GH_ANON_BEARER=$(curl -s "https://ghcr.io/token?service=registry.docker.io&scope=repository:${CONTAINER_PACKAGE}:pull" | jq -r .token) -curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/blobs/$(curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/manifests/v3.1.0-rc2 | jq -r .layers[0].digest) | tar zx +curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/blobs/$(curl -s -L -H "Authorization: Bearer ${GH_ANON_BEARER}" https://ghcr.io/v2/${CONTAINER_PACKAGE}/manifests/v${NODE_VERSION} | jq -r .layers[0].digest) | tar -xz if [ "${ARCH}" = "x86_64" ]; then wget https://github.com/${ORG}/leap/releases/download/v${NODE_VERSION}/leap-${NODE_VERSION}-ubuntu20.04-x86_64.deb