run jobs sequentially

Instead of an ugly Makefile structure, we now use a single compile
script that collects all the files in build/doc.

.ci/ci_build.sh

@@ -1,18 +0,0 @@
-set -e
-cd .ci
-export COMMIT_MSG=$(python3 print_deploy_message.py)
-cd ..
-make ci-build
-cd build/LatexPackagesBuild
-git add .
-git commit -m "${COMMIT_MSG}" || echo "Nothing new to commit"
-git push --set-upstream origin ${CI_COMMIT_REF_NAME}-build
-cd ../..
-mkdir -p ~/texmf/tex/latex
-cp -r build/LatexPackagesBuild ~/texmf/tex/latex
-make doc
-cd build
-mv LatexPackagesBuild LatexPackages
-zip -r LatexPackages.zip LatexPackages/ -x '*.git*'
-zip -r LatexPackagesDocumentation.zip documentation
-tree -H '.' -I "index.html" -D --charset utf-8 -T "LatexPackages" > index.html

.ci/configure_git.sh

@@ -1,12 +1,17 @@
 set -e
-eval $(ssh-agent -s)
-echo "$GITLAB_DEPLOY_KEY" | base64 -d | tr -d '\r' | ssh-add - > /dev/null
 
+# Set up ssh private key
 mkdir -p ~/.ssh
 chmod 700 ~/.ssh
 
-ssh-keyscan gitlab.com >> ~/.ssh/known_hosts
+echo "$DEPLOY_SSH_KEY" > ~/.ssh/id_ed25519
+chmod 600 ~/.ssh/id_ed25519
+
+# Set up remote host key fingerprint
+echo "git.abstractnonsen.se ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAufJTq206GOv0D8gHs2o3eDusLNWaB0U7JRhUYnux9B" >> ~/.ssh/known_hosts
 chmod 644 ~/.ssh/known_hosts
 
 git config --global user.email "git@maximilian-kessler.de"
 git config --global user.name "Maximilian Keßler (via gitlab runner)"
+
+echo "Successfully added ssh deploy keys"

.ci/deploy/deploy_message.py

@@ -14,6 +14,6 @@ def get_deploy_message(repo):
            "\n" \
            "Build branch {branch} ({hexsha}) from {repo_name}" \
         .format(old_msg=old_msg,
-                branch=os.environ['CI_COMMIT_REF_NAME'],
+                branch=os.environ['REF_NAME'],
                 hexsha=get_latest_commit(repo).hexsha[0:7],
-                repo_name='kesslermaximilian/LatexPackages')
+                repo_name='latex/latex-packages')

.ci/deploy_to_build_repo.sh

@@ -0,0 +1,14 @@
+set -e
+
+# set up deploy message
+cd .ci
+export COMMIT_MSG=$(python3 print_deploy_message.py)
+cd ..
+
+# push pages to build repository
+cd build/packages
+git add .
+git commit -m "${COMMIT_MSG}" || echo "Nothing new to commit"
+git remote set-url origin --push git@git.abstractnonsen.se:latex/latex-packages-build
+git push --set-upstream origin ${REF_NAME}-build
+cd ../..

.ci/setup_build_repo_branch.sh

@@ -1,13 +1,13 @@
 # ! /bin/sh
 set -e
-ssh git@gitlab.com
+
-git clone git@gitlab.com:latexci/packages/LatexPackagesBuild.git build/LatexPackagesBuild
+cd build/packages
-cd build/LatexPackagesBuild
+
-REMOTE_BRANCH=$(git branch -a | sed -n '/remotes\/origin\/.*-build/p' | sed 's/remotes\/origin\///g' | sed 's/-build//g' | sed 's/[[:space:]]//g' | sed -n "/^${CI_COMMIT_REF_NAME}$/p")
+REMOTE_BRANCH=$(git branch -a | sed -n '/remotes\/origin\/.*-build/p' | sed 's/remotes\/origin\///g' | sed 's/-build//g' | sed 's/[[:space:]]//g' | sed -n "/^${REF_NAME}$/p")
 
 echo ${REMOTE_BRANCH}
 
-if [ "$REMOTE_BRANCH" = "" ];then
+if [ "$REMOTE_BRANCH" = "" ]; then
     echo "This is the first build on this branch, creating new branch in build repository to push to"
     git checkout --orphan ${CI_COMMIT_REF_NAME}-build
     ls -ra | sed '/^\.git$/d' | sed '/^\.\.$/d' | sed '/^\.$/d' |  xargs -r git rm --cached

.gitea/workflows/build.yaml

@@ -0,0 +1,81 @@
+name: Build LaTeX packages
+on: [push]
+
+jobs:
+  build:
+    runs-on: latex-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0    # We need all history to correctly parse tag names
+          fetch-tags: true
+      - name: Setup git credentials and committer
+        run: .ci/configure_git.sh
+        env:
+          DEPLOY_SSH_KEY: ${{ secrets.deploy_ssh_key }}
+      - name: Clone build repository
+        uses: actions/checkout@v4
+        with:
+          repository: latex/latex-packages-build
+          path: build/packages
+          ref: master
+      - name: Checkout correct branch in build repository
+        run: |
+          .ci/setup_build_repo_branch.sh
+        env:
+          REF_NAME: ${{ github.ref_name }}
+      - name: Build packages incrementally
+        run: make
+      - name: Push packages to build repo
+        run: |
+          .ci/deploy_to_build_repo.sh
+        env:
+          REF_NAME: ${{ github.ref_name }}
+      - name: Clean up git files from build repo
+        if: github.ref == 'refs/heads/master'
+        run: rm -rf build/packages/.git
+      - name: Save built packages to cache
+        if: github.ref == 'refs/heads/master'
+        uses: actions/cache/save@v3
+        with:
+          path: build/packages/
+          key: ${{ github.ref }}-packages
+
+  pages:
+    runs-on: latex-latest
+    needs: build
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Load package cache
+        uses: actions/cache/restore@v3
+        with:
+          path: build/packages/
+          key: ${{ github.ref }}-packages
+      - name: Load compilation cache
+        uses: actions/cache/restore@v3
+        with:
+          path: .compile
+          key: ${{ github.ref }}-doc
+      - name: Compile documentation
+        run: make doc
+        env:
+          TEXINPUTS: '${{ github.workspace }}/build/packages//:'
+      - name: Prepage pages
+        run: |
+          cd build
+          rm -rf packages/.git  # Don't deploy the git files
+          zip -r latex-packages.zip packages/ -x '*.git*'
+          zip -r latex-packages-doc.zip doc/
+      - name: Deploy to pages
+        uses: actions/pages@v1
+        with:
+          directory: build/
+      - name: Upload compilation cache
+        uses: actions/cache/save@v3
+        with:
+          path: .compile
+          key: ${{ github.ref }}-doc

.gitlab-ci.yml

@@ -1,44 +0,0 @@
-stages:
-  - get
-  - build
-  - pages
-
-get-build-repo:
-  stage: get
-  before_script:
-      - source .ci/configure_git.sh
-  script:
-      - echo "Getting old Build repo..."
-      - .ci/get_build_repo_from_origin.sh
-  artifacts:
-    paths:
-      - build/
-  tags:
-    - latex
-
-build-packages:
-  stage: build
-  before_script:
-      - source .ci/configure_git.sh
-  script:
-    - echo "Building packages incrementally..."
-    - sh .ci/ci_build.sh
-  variables:
-      GIT_SUBMODULE_STRATEGY: recursive
-  artifacts:
-    paths:
-        - build/
-  tags:
-    - latex
-
-pages:
-    stage: pages
-    artifacts:
-        paths:
-            - public/
-    script:
-        - mv build/ public/
-    tags:
-        - latex
-    only:
-        - master

Makefile

@@ -1,11 +1,29 @@
+# Makefile for latex-packages
+
+BUILD_DIR=build
+DOC_SUBDIR=doc
+PACKAGES_SUBDIR=packages
+COMPILE_SUBDIR=.compile
 BUILD_FLAGS=--recursive --git-version --pytex-version --license --author "Maximilian Keßler" --pytex-info-text --extra-header ".build/header_info.txt" --name "prepend-author" --clean-old-files
-BUILD_DIRS= --source-dir src --build-dir build
 
+ROOT=$(shell pwd)
+BUILD_ROOT=${ROOT}/${BUILD_DIR}
+
+
+# Build packages
 build: .initsubmodulelock
-	@python3 build.py ${BUILD_DIRS} ${BUILD_FLAGS}
+	python3 build.py --source-dir src --build-dir ${BUILD_ROOT}/${PACKAGES_SUBDIR} ${BUILD_FLAGS}
 
+# Build packages and allow repo to be dirty (use with caution and only when developing)
 dirty: .initsubmodulelock
-	@python3 build.py ${BUILD_DIRS} ${BUILD_FLAGS} --allow-dirty
+	python3 build.py --source-dir src --build-dir ${BUILD_ROOT}/${PACKAGES_SUBDIR} ${BUILD_FLAGS} --allow-dirty
+
+# generate documentation files from /doc
+doc:
+	@scripts/compile_doc.sh
+	@mkdir -p ${BUILD_ROOT}/${DOC_SUBDIR}
+	@cp .compile/*.pdf ${BUILD_ROOT}/${DOC_SUBDIR}
+	@echo Documentation files written to ${BUILD_ROOT}/${DOC_SUBDIR}
 	
 init: .initsubmodulelock .gitconfiglock
 
@@ -27,12 +45,9 @@ all: clean build
 
 clean:
 	@-rm -r build/
-
+	@-rm -r .compile/
-ci-build:
-	@python3 build.py --source-dir src --build-dir build/LatexPackagesBuild ${BUILD_FLAGS}
-
-doc:
-	@-rm -r build/documentation
-	$(MAKE) -C doc central-doc
 
 .PHONY: build doc
+#!/bin/bash
+# Compiles all correspondence letters in repository
+

README.md

@@ -11,11 +11,11 @@ Mostly, they are available as a repository so that
 - This motivates me to keep things organized
 
 ## Usage
-If you want to use these, just clone [LatexPackagesBuild](https://gitlab.com/latexci/packages/LatexPackagesBuild) into your `~/texmf/tex/latex` directory, and you are ready to go.
+If you want to use these, just clone [latex-packages-build][lp-build] into your `~/texmf/tex/latex` directory, and you are ready to go.
-The builds are also available as single files or as zip at [GitLab pages](https://latexci.gitlab.io/packages/LatexPackages).
+The builds are also available as single files or as zip at the [pages][pages].
 
 ## Documentation
-See the `documentation` folder (or zip file) at [GitLab pages](https://latexci.gitlab.io/packages/LatexPackages) for documentation to most of the packages.
+See the `documentation` folder (or zip file) at [pages][pages] for documentation to most of the packages.
 
 ## Bugs
 As already mentioned, not all of these are intended for generic use. If you however feel like this should be the case, feel free to point out bugs or troubles when using these here at GitHub or to me directly.
@@ -28,4 +28,8 @@ This is free software.
 Prior to version 2.6 this has been MIT-licensed. Starting with version 1.6 this is licensed under the LPPL and/or the GPLv3.
 See `LICENSE.md` for further details.
 
-The `quiver.sty` package here is taken from [varkor/quiver](https://github.com/varkor/quiver) and licensed under the MIT License. It is redistributed unchanged for dependency reasons of my projects.
+The `quiver.sty` package here is taken from [varkor/quiver][quiver] and licensed under the MIT License. It is redistributed unchanged for dependency reasons of my projects.
+
+[pages]: https://latex.users.abstractnonsen.se/latex-packages
+[lp-build]: https://git.abstractnonsen.se/latex/latex-packages-build
+[quiver]: https://github.com/varkor/quiver

doc/DIR_MAKEFILE

@@ -1,12 +0,0 @@
-TOPTARGETS := all clean doc full central-doc
-
-SUBDIRS := $(wildcard */.)
-
-$(TOPTARGETS): $(SUBDIRS)
-$(SUBDIRS):
-		$(MAKE) -C $@ $(MAKECMDGOALS)
-
-central-doc: $(SUBDIRS)
-		mv *.pdf ..
-
-.PHONY: $(TOPTARGETS) $(SUBDIRS)

doc/DOC_MAKEFILE

@@ -1,11 +0,0 @@
-doc:
-	latexmk
-
-full:
-	latexmk -gg
-
-clean:
-	latexmk -C
-
-central-doc: full
-	mv *.pdf ..

doc/LATEXMKRC

@@ -1,3 +1,10 @@
+# This is the .latexmkrc file that needs to be used for compiling the documentation
+# Note that the makeindex command is non-standard and follows the LaTeX3 architecture
+# Without this, generating the indexes properly will not work and leads to compiling
+# errors.
+# When adding new packages, this should be symlinked to in each new directory,
+# so that a call to latexmk will automatically use these options
+
 $makeindex = 'makeindex -s gind.ist %O -o %D %S';
 $clean_ext .= ' glo';
 $clean_ext .= ' hd';

doc/Makefile

@@ -1,13 +0,0 @@
-TOPTARGETS := all clean doc full central-doc
-
-SUBDIRS := $(wildcard */.)
-
-$(TOPTARGETS): $(SUBDIRS)
-$(SUBDIRS):
-		$(MAKE) -C $@ $(MAKECMDGOALS)
-
-central-doc: $(SUBDIRS)
-		mkdir -p ../build/documentation
-		mv *.pdf ../build/documentation
-
-.PHONY: $(TOPTARGETS) $(SUBDIRS)

doc/environments/Makefile

@@ -1 +0,0 @@
-../DIR_MAKEFILE

doc/environments/fancythm/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/environments/groupthm/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/environments/refproof/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/environments/thmstyle/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/indexing/Makefile

@@ -1 +0,0 @@
-../DIR_MAKEFILE

doc/indexing/symbindex/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/indexing/vocab/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/Makefile

@@ -1 +0,0 @@
-../DIR_MAKEFILE

doc/math/categories/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/faktor/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathalias/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathfig/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathfixes/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathfont/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathop/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/math/mathsymb/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/Makefile

@@ -1 +0,0 @@
-../DIR_MAKEFILE

doc/wrappers/enumerate/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/hypersetup/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/incfig/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/math/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/todo/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

doc/wrappers/unicodechar/Makefile

@@ -1 +0,0 @@
-../../DOC_MAKEFILE

scripts/compile_doc.sh

@@ -0,0 +1,8 @@
+#! /bin/bash
+# Compiles all documentation files in repository
+
+set -e
+
+BUILD_COMMAND="latexmk -output-directory=$(pwd)/.compile $1"
+
+find doc -type f -name "*.tex" -execdir sh -c "$BUILD_COMMAND" -- {} \;

src/environments/fancythm/Makefile

@@ -1,10 +0,0 @@
-pdf:
-	latexmk 
-
-full:
-	latexmk -gg 
-
-clean:
-	latexmk -C
-
-.PHONY: clean

src/environments/groupthm/Makefile

@@ -1,10 +0,0 @@
-pdf:
-	latexmk 
-
-full:
-	latexmk -gg 
-
-clean:
-	latexmk -C 
-
-.PHONY: clean

src/environments/thmstyle/Makefile

@@ -1,10 +0,0 @@
-pdf:
-	latexmk 
-
-full:
-	latexmk -gg 
-
-clean:
-	latexmk -C 
-
-.PHONY: clean

src/environments/thmstyle/thmstyle.dtx

@@ -382,6 +382,7 @@
       \DeclareFancyThmStyle[orange!10]{orange}[thmorangemarginandfill]
       \DeclareFancyThmStyle[blue!7]{blue}[thmbluemarginandfill]
       \DeclareFancyThmStyle{green!70!black}[thmgreenmargin]
+      \DeclareFancyThmStyle[green!10]{green!70!black}[thmgreenmarginandfill]
       \DeclareFancyThmStyle{gold}[thmgoldmargin]
       \DeclareFancyThmStyle{yellow!80!orange}[thmyellowmargin]
       \DeclareFancyThmStyle{gray}[thmgraymargin]

src/indexing/symbindex/symbindex.pysty3

@@ -1,6 +1,8 @@
 __HEADER__(Declaring of math symbols with automatic indexing)
 
-\RequirePackage{imakeidx}
+\@ifclassloaded{beamer}{}{
+  \RequirePackage{imakeidx}
+}
 \RequirePackage{xparse}
 
 % Keys used for declaring symbols
@@ -35,6 +37,7 @@ __HEADER__(Declaring of math symbols with automatic indexing)
       {
         \bool_if:cF { used_#2 }
         {
+          \@ifclassloaded{beamer}{}{
             \index[#1]
               {
                 #7
@@ -42,6 +45,7 @@ __HEADER__(Declaring of math symbols with automatic indexing)
                 $#4{#5}#6$
                 #3
               }
+          }
           \bool_gset_true:c { used_#2 }
         }
         #4{#5}

src/indexing/vocab/vocab.pysty

@@ -21,25 +21,25 @@ __IF__(index)
     %Emphasize \vocabulary
     \RequirePackage{expl3}
     \ExplSyntaxOn
-    \NewDocumentCommand{\vocab}{O{} m}{
+    \NewDocumentCommand{\vocab}{O{} m}{%
         \textbf{\color{blue} #2}%
         \if\relax\detokenize{#1}\relax%
         \index[vocabindex]{\text_titlecase_first:n{#2}} % true branch: #1 was empty
-        \else
+        \else%
         \index[vocabindex]{#1} % false branch: #1 was supplied
-        \fi
+        \fi%
     }
     \ExplSyntaxOff
-    \newcommand\printvocabindex{
+    \newcommand\printvocabindex{%
-        \printindex[vocabindex]
+        \printindex[vocabindex]%
     }
     \NewDocumentCommand{\PrintVocabIndex}{ }
-    {
+    {%
-        \printindex[vocabindex]
+        \printindex[vocabindex]%
     }
 \else
-    \NewDocumentCommand{\vocab}{O{} m }{
+    \NewDocumentCommand{\vocab}{O{} m }{%
-        \textbf{\color{blue} #2}
+        \textbf{\color{blue} #2}%
-    }
+    }%
 \fi
 

src/math/mathop/mathop.pysty

@@ -87,6 +87,7 @@ __END_OPTIONS_X__
 \DeclareSimpleMathOperator{Tor}
 \DeclareSimpleMathOperator{MaxSpec}
 \DeclareSimpleMathOperator{Sh}
+\DeclareSimpleMathOperator{PSh}
 \DeclareSimpleMathOperator{Proj}
 \DeclareSimpleMathOperator{QCoh}
 \DeclareSimpleMathOperator{Fun}