From 7808d518c61cf3a0c4597558a3d75881c85609f6 Mon Sep 17 00:00:00 2001 From: Thiago Silva Date: Fri, 20 May 2022 13:56:14 -0300 Subject: [PATCH] Removes the changelog generation from the RPM workflow --- .github/workflows/live_artifacts.yml | 3 +-- ci/build-centos.sh | 2 +- util/makesrc | 25 +++---------------------- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml index de1fc72f..600700a0 100644 --- a/.github/workflows/live_artifacts.yml +++ b/.github/workflows/live_artifacts.yml @@ -84,8 +84,7 @@ jobs: - name: Build Artifact run: | mkdir -p ${GITHUB_WORKSPACE}/artifacts - docker run -e LIVE=1 -e PAT=${{ secrets.GITHUB_TOKEN }} \ - -e TAG=$TAG -e REPO_TO_BUILD=$REPO_TO_BUILD + docker run -e LIVE=1 -e TAG=$TAG -e REPO_TO_BUILD=$REPO_TO_BUILD \ -v ${GITHUB_WORKSPACE}:/workspace \ -v ${GITHUB_WORKSPACE}/artifacts:/root/rpmbuild \ nanocurrency/nano-env:centos /bin/bash -c "ci/build-centos.sh" diff --git a/ci/build-centos.sh b/ci/build-centos.sh index 39157c31..37e5ebb7 100755 --- a/ci/build-centos.sh +++ b/ci/build-centos.sh @@ -5,7 +5,7 @@ RELEASE=$(echo $CI_JOB_ID) REPO_TO_BUILD=$(echo $REPO_TO_BUILD) run_source() { - ./util/makesrc $TAG $(echo $PAT) $REPO_TO_BUILD + ./util/makesrc $TAG $REPO_TO_BUILD } run_build() { diff --git a/util/makesrc b/util/makesrc index a4e22ce8..9ba5ba9e 100755 --- a/util/makesrc +++ b/util/makesrc @@ -1,19 +1,14 @@ #!/bin/bash -# makesrc -# personal access token allows around rate limit - if [ -e $2 ]; then - echo "makesrc " >&2 + echo "makesrc " >&2 echo " tag valid for " >&2 - echo " pat personal access token" >&2 echo " repo repository to build" >&2 exit 1 fi TAG="$1" -PAT="$2" -repository="${3:-nanocurrency/nano-node}" +repository="${2:-nanocurrency/nano-node}" VERSION=$(echo $TAG | sed 's/V//') TAG_DATE="" VERSION_MAJOR=$(echo $VERSION | cut -d "." -f 1) @@ -41,28 +36,14 @@ function source_information() { DATE=$(git log --tags --simplify-by-decoration --pretty="format:%ai %d" | head -1 | cut -d " " -f1-3) 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 - export TAG_DATE } function cleanup_source() { mv nano-$VERSION.tar.gz ~/. echo "ARCHIVE MOVDED TO HOME..." rm -fr nano-$TAG/ - } + function tarball_creation() { cd .. ARCHIVE_FILE_NAME="nano-${VERSION}.tar.gz"