Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion installer/rpm/algorand/algorand.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ 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"
#${GOPATH}/bin/buildtools genesis ensure -n ${dir} --source ${REPO_DIR}/gen/${dir}/genesis.json --target ${PKG_ROOT}/var/lib/algorand/genesis/${dir}/genesis.json --releasedir ${REPO_DIR}/installer/genesis
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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions scripts/compute_branch_channel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions scripts/compute_branch_network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ if [ "${BRANCH}" = "rel/stable" ]; then
elif [ "${BRANCH}" = "rel/beta" ]; then
echo "betanet"
exit 0
elif [ "${BRANCH}" = "feature/alphanet" ]; then
Comment thread
egieseke marked this conversation as resolved.
echo "alphanet"
exit 0
fi

#get parent of current branch
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/build/deb/build_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion scripts/release/mule/common/get_channel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
8 changes: 4 additions & 4 deletions scripts/release/mule/deploy/docker/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion scripts/release/mule/package/deb/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/mule/test/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down