Skip to content

Commit c7532c6

Browse files
authored
Merge pull request #71 from homalg-project/PackageJanitor-1638368526
Apply PackageJanitor
2 parents b625905 + 0ad55bb commit c7532c6

File tree

3 files changed

+24
-21
lines changed

3 files changed

+24
-21
lines changed

.github/workflows/Tests.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
- "*-ci"
88
pull_request:
99
schedule:
10-
- cron: "0 0 * * *"
10+
- cron: "0 4 * * *" # after gap-docker(-master) is rebuilt
1111
workflow_dispatch:
1212

1313
jobs:
1414
test:
1515
strategy:
1616
matrix:
17-
image: [gapsystem/gap-docker, gapsystem/gap-docker-master]
17+
image: ["ghcr.io/homalg-project/gap-docker:latest", "ghcr.io/homalg-project/gap-docker-master:latest"]
1818
fail-fast: false
1919
runs-on: ubuntu-latest
2020
container:
@@ -29,26 +29,30 @@ jobs:
2929
- run: |
3030
export HOME="/home/gap"
3131
cd /home/gap/.gap/pkg/
32-
# work around https://github.com/gap-system/gap-docker-base/issues/30
33-
sudo apt -o Acquire::https::Verify-Peer="false" update
34-
sudo apt -o Acquire::https::Verify-Peer="false" dist-upgrade -y
35-
sudo apt -o Acquire::https::Verify-Peer="false" install -y texlive-latex-extra
3632
cp ./FinSetsForCAP/ci_gaprc /home/gap/.gap/gaprc
3733
git clone --depth 1 https://github.com/gap-packages/AutoDoc.git
3834
git clone --depth 1 https://github.com/homalg-project/homalg_project.git
3935
git clone --depth 1 https://github.com/homalg-project/CAP_project.git
4036
git clone --depth 1 https://github.com/homalg-project/Toposes.git
4137
# set SOURCE_DATE_EPOCH for reproducible PDFs
4238
export SOURCE_DATE_EPOCH=0
39+
# build documentation of packages which we might want to reference, keep this in sync with `release-gap-package`
40+
[ -d "CAP_project/CAP" ] && make -C "CAP_project/CAP" doc
41+
[ -d "CAP_project/FreydCategoriesForCAP" ] && make -C "CAP_project/FreydCategoriesForCAP" doc
42+
[ -d "CAP_project/MonoidalCategories" ] && make -C "CAP_project/MonoidalCategories" doc
43+
[ -d "HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra" ] && make -C "HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra" doc
44+
[ -d "homalg_project/homalg" ] && make -C "homalg_project/homalg" doc
45+
[ -d "homalg_project/Modules" ] && make -C "homalg_project/Modules" doc
46+
[ -d "Toposes" ] && make -C "Toposes" doc
4347
TERM=dumb make -C FinSetsForCAP -j $(nproc) --output-sync ci-test
4448
cp ./FinSetsForCAP/.codecov.yml ./
4549
(cd FinSetsForCAP && LANG=C.UTF-8 python3 process_coverage_ignored_lines.py)
46-
[ "${{ matrix.image }}" = "gapsystem/gap-docker-master" ] && ./FinSetsForCAP/upload_codecov.sh
50+
[ "${{ matrix.image }}" = "ghcr.io/homalg-project/gap-docker-master:latest" ] && ./FinSetsForCAP/upload_codecov.sh
4751
git config --global user.name "Bot"
4852
git config --global user.email "empty"
4953
cd FinSetsForCAP
5054
CUR_SHA=$(git rev-parse --verify HEAD)
51-
if [ "${{ matrix.image }}" = "gapsystem/gap-docker" ] && [ "$CUR_SHA" = "$(git rev-parse origin/master)" ] && [ $(dirname "$GITHUB_REPOSITORY") = "homalg-project" ]; then \
55+
if [ "${{ matrix.image }}" = "ghcr.io/homalg-project/gap-docker:latest" ] && [ "$CUR_SHA" = "$(git rev-parse origin/master)" ] && [ $(dirname "$GITHUB_REPOSITORY") = "homalg-project" ]; then \
5256
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); \
5357
git checkout master; \
5458
LANG=C.UTF-8 ./make_dist.sh --token "${{ secrets.GITHUB_TOKEN }}"; \

release-gap-package

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -460,18 +460,17 @@ fi
460460
# make sure every file is readable
461461
chmod -R a+r .
462462

463-
# adjust links to other manuals
464-
# Note that we cannot use sed's `-i` option for in-place editing, as
465-
# that is a non-portable extension of POSIX, which works differently in
466-
# BSD and GNU make.
467-
for f in ./*/*.htm* ; do
468-
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"
469-
mv "$f.bak" "$f"
470-
done
471-
472-
for f in ./*/*.htm* ; do
473-
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"
474-
mv "$f.bak" "$f"
463+
for package in CAP_project/CAP CAP_project/FreydCategoriesForCAP CAP_project/MonoidalCategories HigherHomologicalAlgebra/ToolsForHigherHomologicalAlgebra homalg_project/homalg homalg_project/Modules Toposes; do
464+
465+
# adjust links to other manuals
466+
# Note that we cannot use sed's `-i` option for in-place editing, as
467+
# that is a non-portable extension of POSIX, which works differently in
468+
# BSD and GNU make.
469+
for f in ./*/*.htm* ; do
470+
sed "s;href=\"/home/gap/.gap/pkg/$package/doc/;href=\"https://homalg-project.github.io/$package/doc/;g" "$f" > "$f.bak"
471+
mv "$f.bak" "$f"
472+
done
473+
475474
done
476475

477476
# basic sanity check

upload_codecov.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ shasum -a 256 -c codecov.SHA256SUM
2323

2424
# execute
2525
chmod +x codecov
26-
./codecov
26+
./codecov -Z

0 commit comments

Comments
 (0)