From 4b4c6800c4abb6c9f668a11545e83b6c19bfba3a Mon Sep 17 00:00:00 2001 From: Christophe Favergeon Date: Thu, 30 Jun 2022 09:43:13 +0200 Subject: [PATCH] Reverting automatic pack index generation. (packs are still automatically downloaded). --- .github/workflows/build.yaml | 28 ++-------------------------- ARM.CMSIS-DSP.pdsc | 5 ++--- Scripts/git/check_links.sh | 0 Scripts/git/gen_changelog.sh | 29 +++++++---------------------- Scripts/git/gen_pack.sh | 5 +---- Scripts/git/gen_pack_index.sh | 13 ------------- Scripts/git/git-configure.sh | 0 Scripts/git/git_describe.sh | 0 8 files changed, 12 insertions(+), 68 deletions(-) mode change 100755 => 100644 Scripts/git/check_links.sh mode change 100755 => 100644 Scripts/git/gen_changelog.sh mode change 100755 => 100644 Scripts/git/gen_pack.sh delete mode 100755 Scripts/git/gen_pack_index.sh mode change 100755 => 100644 Scripts/git/git-configure.sh mode change 100755 => 100644 Scripts/git/git_describe.sh diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 92769f47..319bffe7 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -87,7 +87,7 @@ jobs: mkdir -p ~/.arm/Packs/.Web wget -O ~/.arm/Packs/.Web/ARM.CMSIS.pdsc https://www.keil.com/pack/ARM.CMSIS.pdsc echo "::add-matcher::.github/packchk.json" - /bin/bash ./Scripts/git/gen_pack.sh -k + /bin/bash ./Scripts/git/gen_pack.sh echo "::remove-matcher owner=packchk::" - name: Archive pack @@ -108,30 +108,6 @@ jobs: tag: ${{ github.ref }} overwrite: true - - name: Generate pack index - if: ${{ github.event_name == 'release' }} - run: | - VERSION=$(sed 's/refs\/tags\/v//' <<< $GITHUB_REF) - /bin/bash ./Scripts/git/gen_pack_index.sh ${VERSION} > /tmp/CMSIS-DSP.pidx - cp ./build/ARM.CMSIS-DSP.pdsc /tmp/ - - - uses: actions/checkout@v2 - if: ${{ github.event_name == 'release' }} - with: - ref: pack-index - - - name: Update pack index - if: ${{ github.event_name == 'release' }} - run: | - RELEASE=$(sed 's/refs\/tags\///' <<< $GITHUB_REF) - cp -f /tmp/CMSIS-DSP.pidx . - cp -f /tmp/ARM.CMSIS-DSP.pdsc . - git config user.name github-actions - git config user.email github-actions@github.com - git add . - git commit -m "Update pack index with release ${RELEASE}" - git push - - uses: actions/checkout@v2 if: ${{ github.event_name == 'release' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' }} with: @@ -153,7 +129,7 @@ jobs: - name: Publish documentation if: ${{ github.event_name == 'release' }} run: | - RELEASE=$(sed 's/refs\/tags\///' <<< $GITHUB_REF) + RELEASE=$(echo $GITHUB_REF | sed 's/refs\/tags\///') rm -rf ${RELEASE} mkdir -p ${RELEASE} rm -f latest diff --git a/ARM.CMSIS-DSP.pdsc b/ARM.CMSIS-DSP.pdsc index 01c7936a..275246b9 100644 --- a/ARM.CMSIS-DSP.pdsc +++ b/ARM.CMSIS-DSP.pdsc @@ -5,9 +5,8 @@ CMSIS Embedded Compute Library ARM LICENSE.txt - https://raw.githubusercontent.com/ARM-software/CMSIS-DSP/pack-index/ - https://github.com/ARM-software/CMSIS-DSP.git - + https://www.keil.com/pack/ + Active development ... diff --git a/Scripts/git/check_links.sh b/Scripts/git/check_links.sh old mode 100755 new mode 100644 diff --git a/Scripts/git/gen_changelog.sh b/Scripts/git/gen_changelog.sh old mode 100755 new mode 100644 index 34447b67..c03b024d --- a/Scripts/git/gen_changelog.sh +++ b/Scripts/git/gen_changelog.sh @@ -4,7 +4,7 @@ DIRNAME=$(dirname $(readlink -f $0)) DESCRIBE=$(readlink -f ${DIRNAME}/git_describe.sh) function usage { - echo "$(basename $0) [-h|--help] [-f|--format ] [-u|--url ] [tag-prefix]" + echo "$(basename $0) [-h|--help] [-f|--format ] [tag-prefix]" echo "" echo "Arguments:" echo " -h|--help Print this usage message and exit." @@ -14,8 +14,6 @@ function usage { echo " dxy Release notes for Doxygen" echo " html Release notes for HTML" echo " -p|--pre Include latest pre-release." - echo " -u|--url Add url attribute to each release:" - echo " Placeholders are TAG, VERSION, DATE." echo " tag-prefix Prefix to filter tags." echo "" } @@ -43,14 +41,11 @@ function print_pdsc_head { } function print_pdsc { - echo -n " " + else + echo " " fi - echo ">" echo -e "$3" | \ sed "s/^/ /" | \ sed "s/
//" | \ @@ -113,7 +108,6 @@ function print_html_tail { POSITIONAL=() FORMAT="text" PRERELEASE=0 -URL="" while [[ $# -gt 0 ]] do key="$1" @@ -132,11 +126,6 @@ do PRERELEASE=1 shift ;; - '-u'|'--url') - shift - URL=$1 - shift - ;; *) # unknown option POSITIONAL+=("$1") # save it in an array for later shift # past argument @@ -161,14 +150,10 @@ if [[ $PRERELEASE != 0 ]] && ! git rev-list "${PREFIX}${LATEST}" >/dev/null; the fi for TAG in $TAGS; do - TAG="${TAG#refs/tags/}" - VERSION="${TAG#${PREFIX}}" + TAG="${TAG#refs/tags/}" DESC=$(git tag -l -n99 --format "%(contents)" ${TAG} 2>/dev/null) DATE=$(git tag -l -n99 --format "%(taggerdate:short)" ${TAG} 2>/dev/null) - if [ -n "$URL" ]; then - DLURL=$(TAG=$TAG VERSION=$VERSION DATE=$DATE envsubst <<< $URL) - fi - print_$FORMAT "${VERSION}" "${DATE}" "${DESC}" "${DLURL}" + print_$FORMAT "${TAG#${PREFIX}}" "${DATE}" "${DESC}" done print_${FORMAT}_tail diff --git a/Scripts/git/gen_pack.sh b/Scripts/git/gen_pack.sh old mode 100755 new mode 100644 index 949375aa..4979ff39 --- a/Scripts/git/gen_pack.sh +++ b/Scripts/git/gen_pack.sh @@ -118,9 +118,6 @@ PACK_DELETE_FILES="" # Specify patches to be applied PACK_PATCH_FILES="" -# Specify the pack download url pattern -PACK_URL="https://github.com/ARM-software/CMSIS-DSP/releases/download" - ############ DO NOT EDIT BELOW ########### echo Starting CMSIS-Pack Generation: `date` # Zip utility check @@ -187,7 +184,7 @@ last=$(grep -n "" ${PACK_VENDOR}.${PACK_NAME}.pdsc | cut -d: -f1) let first-=1 let last+=1 head -n ${first} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" > "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" -/bin/bash "${CHANGELOG}" -p -f pdsc -u "${PACK_URL}/\${TAG}/${PACK_VENDOR}.${PACK_NAME}.\${VERSION}.pack" 2>/dev/null | sed "s/^/ /" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" +/bin/bash "${CHANGELOG}" -p -f pdsc 2>/dev/null | sed "s/^/ /" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" tail -n +${last} "./${PACK_VENDOR}.${PACK_NAME}.pdsc" | \ sed -e "s/Cversion=\"[^\"]*\"/Cversion=\"${VERSION}\"/" >> "${PACK_BUILD}/${PACK_VENDOR}.${PACK_NAME}.pdsc" diff --git a/Scripts/git/gen_pack_index.sh b/Scripts/git/gen_pack_index.sh deleted file mode 100755 index 7d9f2e63..00000000 --- a/Scripts/git/gen_pack_index.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -cat < - - ARM - https://raw.githubusercontent.com/ARM-software/CMSIS-DSP/pack-index/ - $(date -u +%FT%TZ) - - - - -EOF diff --git a/Scripts/git/git-configure.sh b/Scripts/git/git-configure.sh old mode 100755 new mode 100644 diff --git a/Scripts/git/git_describe.sh b/Scripts/git/git_describe.sh old mode 100755 new mode 100644