From 8bcc3818b63d7678810e5052c7b5be228ca9a401 Mon Sep 17 00:00:00 2001 From: Thiago Silva Date: Wed, 4 May 2022 18:17:30 -0300 Subject: [PATCH] Fixes to let it run in the CI --- .github/workflows/live_artifacts.yml | 15 ++++++++------- ci/actions/deploy.sh | 18 ++++++++++++++++-- util/build_prep/centos/prep.sh.in | 2 +- util/makesrc | 26 +++++++++++++------------- 4 files changed, 38 insertions(+), 23 deletions(-) diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml index cd5d9abdc..633b216e3 100644 --- a/.github/workflows/live_artifacts.yml +++ b/.github/workflows/live_artifacts.yml @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-20.04 timeout-minutes: 90 steps: - - name: tag + - name: Checkout the Tag run: | echo "TAG=${{ github.event.inputs.ref }}" >> $GITHUB_ENV - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f @@ -78,18 +78,19 @@ jobs: submodules: "recursive" ref: ${{ github.event.inputs.ref }} repository: ${{ github.event.inputs.repo }} - - name: centos base + - name: CentOS Base run: ci/build-docker-image.sh docker/ci/Dockerfile-centos nanocurrency/nano-env:centos - name: Build Artifact run: | - docker run -e LIVE=1 -v ${GITHUB_WORKSPACE}:/workspace \ - -v artifacts:/root/rpmbuild/RPMS -v source:/root/rpmbuild/SOURCES \ + mkdir -p ${GITHUB_WORKSPACE}/artifacts + docker run -e LIVE=1 -e PAT=${{ secrets.GITHUB_TOKEN }} \ + -e TAG=$TAG -v ${GITHUB_WORKSPACE}:/workspace \ + -v ${GITHUB_WORKSPACE}/artifacts:/root/rpmbuild \ nanocurrency/nano-env:centos /bin/bash -c "ci/build-centos.sh" - env: - PAT: ${{ secrets.GITHUB_TOKEN }} - - name: Deploy Artifact + - name: Deploy Artifacts run: ci/actions/deploy.sh env: + LINUX_RPM: 1 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_DEFAULT_REGION: us-east-2 diff --git a/ci/actions/deploy.sh b/ci/actions/deploy.sh index 88bee52ed..6895108c9 100755 --- a/ci/actions/deploy.sh +++ b/ci/actions/deploy.sh @@ -4,6 +4,7 @@ set -o errexit set -o nounset set -o xtrace OS=$(uname) +IS_RPM_DEPLOY="${LINUX_RPM:-0}" if [[ "${BETA:-0}" -eq 1 ]]; then BUILD="beta" @@ -19,7 +20,20 @@ else DIRECTORY="${S3_BUILD_DIRECTORY}/${BUILD}" fi -if [[ "$OS" == 'Linux' ]]; then +if [[ "$OS" == 'Linux' && "$IS_RPM_DEPLOY" -eq "1" ]]; then + RPMS=$(find ${GITHUB_WORKSPACE}/artifacts/RPMS -type f -name '*.rpm') + SRPMS=$(find ${GITHUB_WORKSPACE}/artifacts/SRPMS -type f -name '*.src.rpm') + for rpm in $RPMS; do + sha256sum $rpm > "${GITHUB_WORKSPACE}/${rpm}.sha256" + aws s3 cp "${rpm}" s3://repo.nano.org/$DIRECTORY/binaries/$(basename "${rpm}") --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers + aws s3 cp "${GITHUB_WORKSPACE}/${rpm}.sha256" s3://repo.nano.org/$DIRECTORY/binaries/$(basename "${rpm}.sha256") --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers + done + for srpm in $SRPMS; do + sha256sum $srpm > "${GITHUB_WORKSPACE}/${srpm}.sha256" + aws s3 cp "${srpm}" s3://repo.nano.org/$DIRECTORY/source/$(basename "${srpm}") --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers + aws s3 cp "${GITHUB_WORKSPACE}/${srpm}.sha256" s3://repo.nano.org/$DIRECTORY/source/$(basename "${srpm}.sha256") --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers + done +elif [[ "$OS" == 'Linux' ]]; then sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.tar.bz2.sha256 sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Linux.deb >$GITHUB_WORKSPACE/nano-node-$TAG-Linux.deb.sha256 aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Linux.tar.bz2 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Linux.tar.bz2 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers @@ -30,4 +44,4 @@ else sha256sum $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg >$GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 aws s3 cp $GITHUB_WORKSPACE/build/nano-node-*-Darwin.dmg s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Darwin.dmg --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers aws s3 cp $GITHUB_WORKSPACE/build/nano-node-$TAG-Darwin.dmg.sha256 s3://repo.nano.org/$DIRECTORY/binaries/nano-node-$TAG-Darwin.dmg.sha256 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers -fi \ No newline at end of file +fi diff --git a/util/build_prep/centos/prep.sh.in b/util/build_prep/centos/prep.sh.in index 75034f70d..8835fa2cd 100644 --- a/util/build_prep/centos/prep.sh.in +++ b/util/build_prep/centos/prep.sh.in @@ -7,7 +7,7 @@ yes | yum update -y yes | yum install -y git wget openssl bzip2 # -yes | yum install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm # epel 7 +yes | yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm # epel 7 yes | yum install -y jq || exit 1 yes | yum install -y rpm-build || exit 1 diff --git a/util/makesrc b/util/makesrc index f42a06ba8..ca0a32aac 100755 --- a/util/makesrc +++ b/util/makesrc @@ -20,7 +20,7 @@ scriptDir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" function make_source() { git clone --recursive --single-branch --branch ${TAG} https://github.com/nanocurrency/nano-node nano-$VERSION cd nano-$VERSION - git pull --tags + git fetch --tags COUNT=$(git tag -l "${TAG}" | wc -l) if [ "$COUNT" -eq 0 ]; then echo "tag $TAG not found" @@ -40,18 +40,18 @@ function source_information() { COMMIT=$(git log | head -1 | cut -d " " -f 2) TAG_DATE=$(TZ=UTC date -d"$DATE" +%s) - ( - eval "$(scl enable rh-python38 'echo -e "source /opt/rh/rh-python38/enable\n"')" - python -m pip install PyGithub mdutils - - python ${scriptDir}/changelog.py -p ${PAT} -t ${TAG} -m full - - if [ ! -s CHANGELOG.md ]; then - echo "CHANGELOG not generated" - exit 1 - fi - exit 0 - ) || exit 1 +# ( +# eval "$(scl enable rh-python38 'echo -e "source /opt/rh/rh-python38/enable\n"')" +# python -m pip install PyGithub mdutils +# +# python ${scriptDir}/changelog.py -p ${PAT} -t ${TAG} -m full +# +# if [ ! -s CHANGELOG.md ]; then +# echo "CHANGELOG not generated" +# exit 1 +# fi +# exit 0 +# ) || exit 1 export TAG_DATE }