Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brice/fix blockers #1673

Merged
merged 2 commits into from
Oct 30, 2020
Merged

Brice/fix blockers #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5531597
Fix issues that came up during betanet release
bricerisingalgorand Oct 30, 2020
c5dd314
Fix how package_name is passed to rpm packaging
bricerisingalgorand Oct 30, 2020
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
30 changes: 8 additions & 22 deletions scripts/build_package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,15 @@ done

mkdir ${PKG_ROOT}/genesis

if [ ! -z "${RELEASE_GENESIS_PROCESS}" ]; then
genesis_dirs=("devnet" "testnet" "mainnet" "betanet")
for dir in "${genesis_dirs[@]}"; do
mkdir -p ${PKG_ROOT}/genesis/${dir}
cp ${REPO_DIR}/installer/genesis/${dir}/genesis.json ${PKG_ROOT}/genesis/${dir}/
#${GOPATHBIN}/buildtools genesis ensure -n ${dir} --source ${REPO_DIR}/gen/${dir}/genesis.json --target ${PKG_ROOT}/genesis/${dir}/genesis.json --releasedir ${REPO_DIR}/installer/genesis
if [ $? -ne 0 ]; then exit 1; fi
done
# Copy the appropriate network genesis.json for our default (in root ./genesis folder)
cp ${PKG_ROOT}/genesis/${DEFAULT_RELEASE_NETWORK}/genesis.json ${PKG_ROOT}/genesis
genesis_dirs=("devnet" "testnet" "mainnet" "betanet")
for dir in "${genesis_dirs[@]}"; do
mkdir -p ${PKG_ROOT}/genesis/${dir}
cp ${REPO_DIR}/installer/genesis/${dir}/genesis.json ${PKG_ROOT}/genesis/${dir}/
if [ $? -ne 0 ]; then exit 1; fi
elif [[ "${CHANNEL}" == "dev" || "${CHANNEL}" == "stable" || "${CHANNEL}" == "nightly" || "${CHANNEL}" == "beta" ]]; then
cp ${REPO_DIR}/installer/genesis/${DEFAULTNETWORK}/genesis.json ${PKG_ROOT}/genesis/
#${GOPATHBIN}/buildtools genesis ensure -n ${DEFAULTNETWORK} --source ${REPO_DIR}/gen/${DEFAULTNETWORK}/genesis.json --target ${PKG_ROOT}/genesis/genesis.json --releasedir ${REPO_DIR}/installer/genesis
if [ $? -ne 0 ]; then exit 1; fi
else
cp installer/genesis/${DEFAULTNETWORK}/genesis.json ${PKG_ROOT}/genesis
if [ $? -ne 0 ]; then exit 1; fi
#if [ -z "${TIMESTAMP}" ]; then
# TIMESTAMP=$(date +%s)
#fi
#${GOPATHBIN}/buildtools genesis timestamp -f ${PKG_ROOT}/genesis/genesis.json -t ${TIMESTAMP}
fi
done
# Copy the appropriate network genesis.json for our default (in root ./genesis folder)
cp ${PKG_ROOT}/genesis/${DEFAULT_RELEASE_NETWORK}/genesis.json ${PKG_ROOT}/genesis
if [ $? -ne 0 ]; then exit 1; fi

TOOLS_ROOT=${PKG_ROOT}/tools

Expand Down
16 changes: 16 additions & 0 deletions scripts/release/common/cpu_name.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Take common name (amd64, arm64, arm) and map to the unames (x86_64, aarch64)

COMMON_NAME="${1}"

if [ "amd64" == "${COMMON_NAME}" ]; then
echo "x86_64"
elif [ "arm64" == "${COMMON_NAME}" ]; then
echo "aarch64"
elif [ "arm32" == "${COMMON_NAME}" ]; then
echo "armv7l"
elif [ "arm" == "${COMMON_NAME}" ]; then
echo "armv7l"
else
echo "Unsupported cpu arch ${COMMON_NAME}"
exit 1
fi
2 changes: 1 addition & 1 deletion scripts/release/mule/Makefile.mule
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ mule-docker:
mule-package-%: PKG_TYPE=$*
mule-package-%:
echo Building algorand package...
scripts/release/mule/package/$(PKG_TYPE)/package.sh
scripts/release/mule/package/$(PKG_TYPE)/package.sh algorand
echo Building algorand-devtools package...
scripts/release/mule/package/$(PKG_TYPE)/package.sh algorand-devtools

Expand Down
8 changes: 5 additions & 3 deletions scripts/release/mule/package/rpm/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ BRANCH=${BRANCH:-$(./scripts/compute_branch.sh)}
CHANNEL=${CHANNEL:-$(./scripts/compute_branch_channel.sh "$BRANCH")}
DEFAULTNETWORK=${DEFAULTNETWORK:-$(./scripts/compute_branch_network.sh "$BRANCH")}
DEFAULT_RELEASE_NETWORK=$(./scripts/compute_branch_release_network.sh "$DEFAULTNETWORK")
PACKAGE_NAME="$1"

find tmp/node_pkgs -name "*${CHANNEL}*linux*${FULLVERSION}*.tar.gz" | cut -d '/' -f3-4 | sort --unique | while read OS_ARCH; do
OS_TYPE=$(echo "${OS_ARCH}" | cut -d '/' -f1)
ARCH_TYPE=$(echo "${OS_ARCH}" | cut -d '/' -f2)
ARCH_UNAME=$(./scripts/release/common/cpu_name.sh ${ARCH_TYPE})
ALGO_BIN="$REPO_DIR/tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE/$CHANNEL/$OS_TYPE-$ARCH_TYPE/bin"
# A make target in Makefile.mule may pass the name as an argument.
ALGORAND_PACKAGE_NAME=${1:-$(./scripts/compute_package_name.sh "$CHANNEL")}
ALGORAND_PACKAGE_NAME=$(./scripts/compute_package_name.sh "$CHANNEL" "$PACKAGE_NAME")

if [[ "$ALGORAND_PACKAGE_NAME" =~ devtools ]]; then
REQUIRED_ALGORAND_PACKAGE=$(./scripts/compute_package_name.sh "$CHANNEL")
Expand All @@ -42,11 +44,11 @@ find tmp/node_pkgs -name "*${CHANNEL}*linux*${FULLVERSION}*.tar.gz" | cut -d '/'
< "./installer/rpm/$INSTALLER_DIR/$INSTALLER_DIR.spec" \
sed -e "s,@PKG_NAME@,$ALGORAND_PACKAGE_NAME," \
-e "s,@VER@,$FULLVERSION," \
-e "s,@ARCH@,$ARCH_TYPE," \
-e "s,@ARCH@,$ARCH_UNAME," \
-e "s,@REQUIRED_ALGORAND_PKG@,$REQUIRED_ALGORAND_PACKAGE," \
> "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec"

rpmbuild --buildroot "$HOME/foo" --define "_rpmdir $RPMTMP" --define "RELEASE_GENESIS_PROCESS x$RELEASE_GENESIS_PROCESS" --define "LICENSE_FILE ./COPYING" -bb "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec" --target $ARCH_TYPE
rpmbuild --buildroot "$HOME/foo" --define "_rpmdir $RPMTMP" --define "RELEASE_GENESIS_PROCESS x$RELEASE_GENESIS_PROCESS" --define "LICENSE_FILE ./COPYING" -bb "$TEMPDIR/$ALGORAND_PACKAGE_NAME.spec" --target $ARCH_UNAME
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should remove this:

--define "RELEASE_GENESIS_PROCESS x$RELEASE_GENESIS_PROCESS"

Then the rpm package will get all the genesis dirs.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1


cp -p "$RPMTMP"/*/*.rpm "./tmp/node_pkgs/$OS_TYPE/$ARCH_TYPE"
echo "${RPMTMP}"
Expand Down