Merge branch 'nightly' into dev

Author: pathumego

.github/workflows/build.yaml

@@ -7,7 +7,6 @@ on:
     branches:
       - main
       - dev
-      - nightly
     tags:
       - '*'
 
@@ -32,10 +31,10 @@ jobs:
         sudo apt-get update
         sudo apt-get install ttfautohint libcairo2-dev python3-cairo-dev pkg-config python3-dev
         sudo snap install yq
-    - uses: actions/cache@v4
+    - uses: actions/cache@v5
       with:
         path: ./venv/
-        key: ${{ runner.os }}-venv-${{ hashFiles('**/requirements*.txt') }}
+        key: ${{ runner.os }}-venv${{ steps.python.outputs.python-version }}-${{ hashFiles('**/requirements*.txt') }}
         restore-keys: |
           ${{ runner.os }}-venv-
     - name: Set artifact name
@@ -68,7 +67,7 @@ jobs:
       with:
         path: ./out
     - name: Archive artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ env.ARTIFACT_NAME }}
         path: |

Makefile

@@ -9,7 +9,7 @@ help:
 	@echo "###"
 	@echo
 	@echo "  make build:  Builds the fonts and places them in the fonts/ directory"
-	@echo "  make test:   Tests the fonts with fontbakery"
+	@echo "  make test:   Tests the fonts with fontspector"
 	@echo "  make proof:  Creates HTML proof documents in the proof/ directory"
 	@echo "  make images: Creates PNG specimen images in the documentation/ directory"
 	@echo
@@ -18,8 +18,6 @@ build: build.stamp
 
 venv: venv/touchfile
 
-venv-test: venv-test/touchfile
-
 customize: venv
 	. venv/bin/activate; python3 scripts/customize.py
 
@@ -32,13 +30,9 @@ venv/touchfile: requirements.txt
 	. venv/bin/activate; pip install -Ur requirements.txt
 	touch venv/touchfile
 
-venv-test/touchfile: requirements-test.txt
-	test -d venv-test || python3 -m venv venv-test
-	. venv-test/bin/activate; pip install -Ur requirements-test.txt
-	touch venv-test/touchfile
-
-test: venv-test build.stamp
-	TOCHECK=$$(find fonts/variable -type f 2>/dev/null); if [ -z "$$TOCHECK" ]; then TOCHECK=$$(find fonts/ttf -type f 2>/dev/null); fi ; . venv-test/bin/activate; mkdir -p out/ out/fontbakery; fontbakery check-googlefonts -l WARN --full-lists --succinct --badges out/badges --html out/fontbakery/fontbakery-report.html --ghmarkdown out/fontbakery/fontbakery-report.md $$TOCHECK  || echo '::warning file=sources/config.yaml,title=Fontbakery failures::The fontbakery QA check reported errors in your font. Please check the generated report.'
+test: build.stamp
+	which fontspector || (echo "fontspector not found. Please install it with 'cargo install fontspector'." && exit 1)
+	TOCHECK=$$(find fonts/variable -type f 2>/dev/null); if [ -z "$$TOCHECK" ]; then TOCHECK=$$(find fonts/ttf -type f 2>/dev/null); fi ; mkdir -p out/ out/fontspector; fontspector --profile googlefonts -l warn --full-lists --succinct --html out/fontspector/fontspector-report.html --ghmarkdown out/fontspector/fontspector-report.md --badges out/badges $$TOCHECK  || echo '::warning file=sources/config.yaml,title=fontspector failures::The fontspector QA check reported errors in your font. Please check the generated report.'
 
 proof: venv build.stamp
 	TOCHECK=$$(find fonts/variable -type f 2>/dev/null); if [ -z "$$TOCHECK" ]; then TOCHECK=$$(find fonts/ttf -type f 2>/dev/null); fi ; . venv/bin/activate; mkdir -p out/ out/proof; diffenator2 proof $$TOCHECK -o out/proof
@@ -55,16 +49,12 @@ clean:
 update-project-template:
 	npx update-template https://github.com/googlefonts/googlefonts-project-template/
 
-update: venv venv-test
+update: venv
 	venv/bin/pip install --upgrade pip-tools
 	# See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for
 	# the `--resolver` flag below.
 	venv/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements.in
 	venv/bin/pip-sync requirements.txt
 
-	venv-test/bin/pip install --upgrade pip-tools
-	venv-test/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements-test.in
-	venv-test/bin/pip-sync requirements-test.txt
-
-	git commit -m "Update requirements" requirements.txt requirements-test.txt
+	git commit -m "Update requirements" requirements.txt
 	git push