diff --git a/installer/rpm/algorand/algorand.spec b/installer/rpm/algorand/algorand.spec index c7cd519bb1..ef58c0db1a 100644 --- a/installer/rpm/algorand/algorand.spec +++ b/installer/rpm/algorand/algorand.spec @@ -59,7 +59,7 @@ install -m 644 ${REPO_DIR}/installer/rpm/algorand/algorand.repo %{buildroot}/usr mkdir -p %{buildroot}/var/lib/algorand/genesis if [ "%{RELEASE_GENESIS_PROCESS}" != "x" ]; then - genesis_dirs=("devnet" "testnet" "mainnet" "betanet") + genesis_dirs=("devnet" "testnet" "mainnet" "betanet" "alphanet") for dir in "${genesis_dirs[@]}"; do mkdir -p %{buildroot}/var/lib/algorand/genesis/${dir} cp ${REPO_DIR}/installer/genesis/${dir}/genesis.json %{buildroot}/var/lib/algorand/genesis/${dir}/genesis.json @@ -89,6 +89,7 @@ fi /var/lib/algorand/genesis/testnet/genesis.json /var/lib/algorand/genesis/betanet/genesis.json /var/lib/algorand/genesis/mainnet/genesis.json + /var/lib/algorand/genesis/alphanet/genesis.json %endif /lib/systemd/system/algorand.service /lib/systemd/system/algorand@.service diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 0cd7c154ae..3c5b1e2198 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -74,7 +74,7 @@ for data in "${data_files[@]}"; do done if [ ! -z "${RELEASE_GENESIS_PROCESS}" ]; then - genesis_dirs=("devnet" "testnet" "mainnet" "betanet") + genesis_dirs=("devnet" "testnet" "mainnet" "betanet" "alphanet") for dir in "${genesis_dirs[@]}"; do mkdir -p "${PKG_ROOT}/var/lib/algorand/genesis/${dir}" cp "${REPO_DIR}/installer/genesis/${dir}/genesis.json" "${PKG_ROOT}/var/lib/algorand/genesis/${dir}/genesis.json" @@ -82,7 +82,7 @@ if [ ! -z "${RELEASE_GENESIS_PROCESS}" ]; then done # Copy the appropriate network genesis.json for our default (in root ./genesis folder) cp "${PKG_ROOT}/var/lib/algorand/genesis/${DEFAULT_RELEASE_NETWORK}/genesis.json" "${PKG_ROOT}/var/lib/algorand" -elif [[ "${CHANNEL}" == "dev" || "${CHANNEL}" == "stable" || "${CHANNEL}" == "nightly" || "${CHANNEL}" == "beta" ]]; then +elif [[ "${CHANNEL}" == "dev" || "${CHANNEL}" == "stable" || "${CHANNEL}" == "nightly" || "${CHANNEL}" == "beta"|| "${CHANNEL}" == "alpha" ]]; then cp "${REPO_DIR}/installer/genesis/${DEFAULTNETWORK}/genesis.json" "${PKG_ROOT}/var/lib/algorand/genesis.json" #${GOPATH}/bin/buildtools genesis ensure -n ${DEFAULTNETWORK} --source ${REPO_DIR}/gen/${DEFAULTNETWORK}/genesis.json --target ${PKG_ROOT}/var/lib/algorand/genesis.json --releasedir ${REPO_DIR}/installer/genesis else diff --git a/scripts/build_package.sh b/scripts/build_package.sh index ccbf0d27e0..d8f169201d 100755 --- a/scripts/build_package.sh +++ b/scripts/build_package.sh @@ -88,7 +88,7 @@ done mkdir ${PKG_ROOT}/genesis -genesis_dirs=("devnet" "testnet" "mainnet" "betanet") +genesis_dirs=("devnet" "testnet" "mainnet" "betanet" "alphanet") for dir in "${genesis_dirs[@]}"; do mkdir -p ${PKG_ROOT}/genesis/${dir} if [ -f "${REPO_DIR}/gen/${dir}/genesis.json" ]; then diff --git a/scripts/compute_branch_channel.sh b/scripts/compute_branch_channel.sh index 90cde3b553..6e8f77eac0 100755 --- a/scripts/compute_branch_channel.sh +++ b/scripts/compute_branch_channel.sh @@ -10,6 +10,8 @@ elif [ "$1" = "rel/stable" ]; then echo "stable" elif [ "$1" = "rel/beta" ]; then echo "beta" +elif [ "$1" = "feature/alphanet" ]; then + echo "alpha" else echo "dev" fi diff --git a/scripts/compute_branch_network.sh b/scripts/compute_branch_network.sh index 9967463b16..a6a0d8f240 100755 --- a/scripts/compute_branch_network.sh +++ b/scripts/compute_branch_network.sh @@ -15,6 +15,9 @@ if [ "${BRANCH}" = "rel/stable" ]; then elif [ "${BRANCH}" = "rel/beta" ]; then echo "betanet" exit 0 +elif [ "${BRANCH}" = "feature/alphanet" ]; then + echo "alphanet" + exit 0 fi #get parent of current branch @@ -26,6 +29,8 @@ if [ "${BRANCHPARENT}" = "rel/stable" ]; then echo "testnet" elif [ "${BRANCHPARENT}" = "rel/beta" ]; then echo "betanet" +elif [ "${BRANCHPARENT}" = "feature/alphanet" ]; then + echo "alphanet" else echo "devnet" fi diff --git a/scripts/release/build/deb/build_deb.sh b/scripts/release/build/deb/build_deb.sh index aeaa4eb307..275c37cd2d 100755 --- a/scripts/release/build/deb/build_deb.sh +++ b/scripts/release/build/deb/build_deb.sh @@ -57,7 +57,7 @@ if [[ ! "$PKG_NAME" =~ devtools ]]; then cp "./installer/$data" "$PKG_ROOT/var/lib/algorand" done - genesis_dirs=("devnet" "testnet" "mainnet" "betanet") + genesis_dirs=("devnet" "testnet" "mainnet" "betanet" "alphanet") for dir in "${genesis_dirs[@]}"; do mkdir -p "$PKG_ROOT/var/lib/algorand/genesis/$dir" cp "./installer/genesis/$dir/genesis.json" "$PKG_ROOT/var/lib/algorand/genesis/$dir/genesis.json" diff --git a/scripts/release/mule/common/get_channel.sh b/scripts/release/mule/common/get_channel.sh index b59937a1a4..d5b82d6409 100755 --- a/scripts/release/mule/common/get_channel.sh +++ b/scripts/release/mule/common/get_channel.sh @@ -2,7 +2,10 @@ NETWORK="$1" -if [ "$NETWORK" = betanet ] +if [ "$NETWORK" = alphanet ] +then + echo alpha +elif [ "$NETWORK" = betanet ] then echo beta elif [ "$NETWORK" = mainnet ] || [ "$NETWORK" = testnet ] diff --git a/scripts/release/mule/deploy/docker/docker.sh b/scripts/release/mule/deploy/docker/docker.sh index c4125f041c..ee0c55fe0c 100755 --- a/scripts/release/mule/deploy/docker/docker.sh +++ b/scripts/release/mule/deploy/docker/docker.sh @@ -13,9 +13,9 @@ if [ -z "$NETWORK" ] || [ -z "$VERSION" ]; then exit 1 fi -if [[ ! "$NETWORK" =~ ^mainnet$|^testnet$|^betanet$ ]] +if [[ ! "$NETWORK" =~ ^mainnet$|^testnet$|^betanet$|^alphanet$ ]] then - echo "[$0] Network values must be either \`mainnet\`, \`testnet\` or \`betanet\`." + echo "[$0] Network values must be either \`mainnet\`, \`testnet\`, \`betanet\`, or \`alphanet\`." exit 1 fi @@ -28,9 +28,9 @@ then # Build and push testnet. ./build_releases.sh --tagname "$VERSION" --network testnet --cached -elif [ "$NETWORK" = betanet ] +elif [ "$NETWORK" = betanet ] || [ "$NETWORK" = alphanet ] then - ./build_releases.sh --tagname "$VERSION" --network betanet + ./build_releases.sh --tagname "$VERSION" --network "$NETWORK" fi popd diff --git a/scripts/release/mule/package/deb/package.sh b/scripts/release/mule/package/deb/package.sh index 6cd9f653ea..8a8612a3af 100755 --- a/scripts/release/mule/package/deb/package.sh +++ b/scripts/release/mule/package/deb/package.sh @@ -63,7 +63,7 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${VERSION}*.tar.gz" | cut -d '/' -f3 cp "installer/$data" "$PKG_ROOT/var/lib/algorand" done - genesis_dirs=("devnet" "testnet" "mainnet" "betanet") + genesis_dirs=("devnet" "testnet" "mainnet" "betanet" "alphanet") for dir in "${genesis_dirs[@]}"; do mkdir -p "$PKG_ROOT/var/lib/algorand/genesis/$dir" cp "./installer/genesis/$dir/genesis.json" "$PKG_ROOT/var/lib/algorand/genesis/$dir/genesis.json" diff --git a/scripts/release/mule/test/test.sh b/scripts/release/mule/test/test.sh index aed2a51107..27efe724ab 100755 --- a/scripts/release/mule/test/test.sh +++ b/scripts/release/mule/test/test.sh @@ -30,8 +30,8 @@ export OS_TYPE export SHA -ALGORAND_PACKAGE_NAME=$([ "$CHANNEL" = beta ] && echo algorand-beta || echo algorand) -DEVTOOLS_PACKAGE_NAME=$([ "$CHANNEL" = beta ] && echo algorand-devtools-beta || echo algorand-devtools) +ALGORAND_PACKAGE_NAME=$(( [ "$CHANNEL" = beta ] && echo algorand-beta ) || ( [ "$CHANNEL" = alpha ] && echo algorand-alpha ) || ( echo algorand )) +DEVTOOLS_PACKAGE_NAME=$(( [ "$CHANNEL" = beta ] && echo algorand-devtools-beta ) || ( [ "$CHANNEL" = alpha ] && echo algorand-devtools-alpha ) || ( echo algorand-devtools )) export ALGORAND_PACKAGE_NAME export DEVTOOLS_PACKAGE_NAME @@ -61,7 +61,7 @@ then # so although it appears as though I just lied to you, I did not :) # # rpm - if [ "$CHANNEL" = "beta" ] + if [ "$CHANNEL" = "beta" ] || [ "$CHANNEL" = "alpha" ] then PACKAGE_NAME_SUFFIX="$CHANNEL-$VERSION-1.$ARCH_BIT" else