Skip to content

Commit 2d33790

Browse files
committed
Merge branch 'stable-1.4'
2 parents 0c909dd + a0fd05c commit 2d33790

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

ci/docker-test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,16 @@ for PKG in "${PKGS[@]}"; do
142142

143143
# Get the relevant version number
144144
if [ "${PACKAGES[0]}" == "latest" ] || [ "$PKG" == "profiling" ]; then
145-
VERSION=`$CURL -s "https://github.com/gap-packages/$PKG/releases/latest" | grep \<title\>Release | awk -F' ' '{print $2}'`
145+
VERSION=`$CURL -s "https://api.github.com/repos/gap-packages/${PKG}/releases" | grep tag_name | head -n 1 | awk -F'"' '{print $4}'`
146146
else
147147
VERSION=`grep "\"$PKG\"" $GAP_HOME/pkg/digraphs/PackageInfo.g | awk -F'"' '{print $4}' | cut -c3-`
148148
fi
149149

150150
if [ -z $VERSION ]; then
151151
bold "Could not determine the version number of the package $PKG!! Aborting..."
152152
exit 1
153+
elif [ "${VERSION:0:1}" == "v" ]; then
154+
VERSION=${VERSION:1}
153155
fi
154156

155157
URL="https://github.com/gap-packages/$PKG/releases/download/v$VERSION/$PKG-$VERSION.tar.gz"

scripts/travis-build-dependencies.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,16 @@ for PKG in "${PKGS[@]}"; do
7474

7575
# Get the relevant version number
7676
if [ "${PACKAGES[0]}" == "latest" ] || [ "$PKG" == "profiling" ]; then
77-
VERSION=`$CURL -s "https://github.com/gap-packages/$PKG/releases/latest" | grep \<title\>Release | awk -F' ' '{print $2}'`
77+
VERSION=`$CURL -s "https://api.github.com/repos/gap-packages/${PKG}/releases" | grep tag_name | head -n 1 | awk -F'"' '{print $4}'`
7878
else
7979
VERSION=`grep "\"$PKG\"" $GAPROOT/pkg/digraphs/PackageInfo.g | awk -F'"' '{print $4}' | cut -c3-`
8080
fi
8181

8282
if [ -z $VERSION ]; then
8383
echo -e "\nCould not determine the version number of the package $PKG!! Aborting..."
8484
exit 1
85+
elif [ "${VERSION:0:1}" == "v" ]; then
86+
VERSION=${VERSION:1}
8587
fi
8688

8789
URL="https://github.com/gap-packages/$PKG/releases/download/v$VERSION/$PKG-$VERSION.tar.gz"

0 commit comments

Comments
 (0)