diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml index 0f607ab..b49fe8a 100644 --- a/.github/workflows/Tests.yml +++ b/.github/workflows/Tests.yml @@ -14,6 +14,7 @@ jobs: strategy: matrix: image: [gapsystem/gap-docker, gapsystem/gap-docker-master] + fail-fast: false runs-on: ubuntu-latest container: image: ${{ matrix.image }} @@ -51,7 +52,7 @@ jobs: if [ "${{ matrix.image }}" = "gapsystem/gap-docker" ] && [ "$CUR_SHA" = "$(git rev-parse origin/master)" ] && [ $(dirname "$GITHUB_REPOSITORY") = "homalg-project" ]; then \ git worktree add gh-pages/ gh-pages || (echo "There was an error. Make sure there is a branch named 'gh-pages'. See https://github.com/homalg-project/PackageJanitor#error-there-was-an-error-make-sure-there-is-a-branch-named-gh-pages"; exit 1); \ git checkout master; \ - ./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \ + LANG=C.UTF-8 ./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \ else \ echo "Not making a release."; \ fi diff --git a/PackageInfo.g b/PackageInfo.g index 8eb3002..ff23828 100644 --- a/PackageInfo.g +++ b/PackageInfo.g @@ -11,7 +11,7 @@ SetPackageInfo( rec( PackageName := "CatReps", Subtitle := "Representations and cohomology of finite categories", Version := Maximum( [ - "2020.10-01", ## Mohamed's version + "2020.10-03", ## Mohamed's version ## this line prevents merge conflicts "2020.10-02", ## Tibor's version ## this line prevents merge conflicts @@ -19,7 +19,7 @@ Version := Maximum( [ ] ), Date := ~.Version{[ 1 .. 10 ]}, -Date := Concatenation( ~.Version{[ 9, 10 ]}, "/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ), +Date := Concatenation( "01/", ~.Version{[ 6, 7 ]}, "/", ~.Version{[ 1 .. 4 ]} ), License := "GPL-2.0-or-later", Persons := [ @@ -79,7 +79,7 @@ README_URL := "https://homalg-project.github.io/CatReps/README.md", ArchiveURL := Concatenation( "https://github.com/homalg-project/CatReps/releases/download/v", ~.Version, "/CatReps-", ~.Version ), # END URLS -ArchiveFormats := ".tar.gz", +ArchiveFormats := ".tar.gz .zip", ## Status information. Currently the following cases are recognized: ## "accepted" for successfully refereed packages diff --git a/README.md b/README.md index b5b3dbf..69881db 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ ### Representations and cohomology of finite categories -| Documentation | Build Status | Code Coverage | -| ------------- | ------------ | ------------- | -| [![HTML stable documentation][docs-img]][docs-url] | [![Build Status][tests-img]][tests-url] | [![Code Coverage][codecov-img]][codecov-url] | +| Documentation | Latest Release | Build Status | Code Coverage | +| ------------- | -------------- | ------------ | ------------- | +| [![HTML stable documentation][html-img]][html-url] [![PDF stable documentation][pdf-img]][pdf-url] | [![version][version-img]][version-url] [![date][date-img]][date-url] | [![Build Status][tests-img]][tests-url] | [![Code Coverage][codecov-img]][codecov-url] | @@ -75,11 +75,17 @@ Q In March 2020 [Peter Webb](https://www-users.math.umn.edu/~webb/)' and his coauthors made a major new release of the former packages `reps` and `catreps` in which they are combined as one. The code of these former packages is still available at [`groupreps`](https://www-users.math.umn.edu/~webb/GAPfiles/groupreps) ([tutorial](https://www-users.math.umn.edu/~webb/GAPfiles/grouprepstutorial.html)) (the new name for the former reps) and [`catreps`](https://www-users.math.umn.edu/~webb/GAPfiles/catreps) ([tutorial](https://www-users.math.umn.edu/~webb/GAPfiles/catrepstutorial.html)), but it will no longer be supported. The new package [`reps`](https://www-users.math.umn.edu/~webb/GAPfiles/reps) combines the functionality of both former packages. ---- +[html-img]: https://img.shields.io/badge/HTML-stable-blue.svg +[html-url]: https://homalg-project.github.io/CatReps/doc/chap0_mj.html +[pdf-img]: https://img.shields.io/badge/PDF-stable-blue.svg +[pdf-url]: https://homalg-project.github.io/CatReps/download_pdf.html -[docs-img]: https://img.shields.io/badge/HTML-stable-blue.svg -[docs-url]: https://homalg-project.github.io/CatReps/doc/chap0_mj.html +[version-img]: https://img.shields.io/endpoint?url=https://homalg-project.github.io/CatReps/badge_version.json +[version-url]: https://homalg-project.github.io/CatReps/view_release.html + +[date-img]: https://img.shields.io/endpoint?url=https://homalg-project.github.io/CatReps/badge_date.json +[date-url]: https://homalg-project.github.io/CatReps/view_release.html [tests-img]: https://github.com/homalg-project/CatReps/workflows/Tests/badge.svg?branch=master [tests-url]: https://github.com/homalg-project/CatReps/actions?query=workflow%3ATests+branch%3Amaster diff --git a/release-gap-package b/release-gap-package index e57400d..3aa1cdd 100755 --- a/release-gap-package +++ b/release-gap-package @@ -244,6 +244,7 @@ else tmp := GAPInfo.PackageInfoCurrent.ArchiveURL; Print("GAP_ERROR=\"The ArchiveURL has unexpected value '",tmp,"'\"\n"); fi; +Print("PDFFile=\"",GAPInfo.PackageInfoCurrent.PackageDoc.PDFFile,"\"\n"); EOF # evaluate the output of GAP, which should be valid shell script code @@ -407,6 +408,13 @@ git archive --prefix="$BASENAME/" "$TAG" . | tar xf - -C "$TMP_DIR" # Build the package documentation, run autoconf, etc. cd "$TMP_DIR/$BASENAME" +# adjust date +# Note that we cannot use sed's `-i` option for in-place editing, as +# that is a non-portable extension of POSIX, which works differently in +# BSD and GNU make. +sed "s;Date := .*;Date := \"$(date +%d/%m/%Y)\",;" PackageInfo.g > PackageInfo.g.bak +mv PackageInfo.g.bak PackageInfo.g + notice "Removing unnecessary files" rm -rf .github .circleci rm -f .git* .hg* .cvs* @@ -451,6 +459,20 @@ fi # make sure every file is readable chmod -R a+r . +# adjust links to other manuals +# Note that we cannot use sed's `-i` option for in-place editing, as +# that is a non-portable extension of POSIX, which works differently in +# BSD and GNU make. +for f in ./*/*.htm* ; do + sed 's;href="/home/gap/.gap/pkg/homalg_project/Modules/doc/;href="https://homalg-project.github.io/homalg_project/Modules/doc/;g' "$f" > "$f.bak" + mv "$f.bak" "$f" +done + +for f in ./*/*.htm* ; do + sed 's;href="/home/gap/.gap/pkg/homalg_project/homalg/doc/;href="https://homalg-project.github.io/homalg_project/homalg/doc/;g' "$f" > "$f.bak" + mv "$f.bak" "$f" +done + # basic sanity check fgrep -q -r '