tooling: revert "extras" zip distribution

.github/workflows/build-fonts.yml

@@ -71,21 +71,15 @@ jobs:
       - name: make zip
         run: |
           ZIP=Inter-${{ env.inter_version }}.zip
-          ZIP_EXTRAS=Inter-${{ env.inter_version }}-extras.zip
           echo "inter_zip=$ZIP" >> $GITHUB_ENV
-          echo "inter_zip_extras=$ZIP_EXTRAS" >> $GITHUB_ENV
+          make -j zip
-          make -j zip zip_extras
+          mv build/release/Inter*.zip "$ZIP"
-          mv build/release/*-extras.zip "$ZIP_EXTRAS"
-          mv build/release/*.zip "$ZIP"
 
       - name: Upload archive (unless tag)
         if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
         uses: actions/upload-artifact@v3
         with:
-          name: "${{ env.inter_zip }}"
+          path: ${{ env.inter_zip }}
-          path: |
-            ${{ env.inter_zip }}
-            ${{ env.inter_zip_extras }}
           retention-days: 1
 
       - name: Create release (if tag)
@@ -94,7 +88,5 @@ jobs:
         with:
           prerelease: true
           name: "${{ env.inter_version }}"
-          body: "This release was automatically created"
+          body: "This release was created automatically"
-          files: |
+          files: ${{ env.inter_zip }}
-            ${{ env.inter_zip }}
-            ${{ env.inter_zip_extras }}

Makefile

@@ -550,10 +550,6 @@ zip: all
 	bash misc/makezip2.sh -reveal-in-finder \
 		"build/release/Inter-$(VERSION)-$(shell git rev-parse --short=10 HEAD).zip"
 
-zip_extras: all
-	bash misc/makezip2.sh -extras -reveal-in-finder \
-		"build/release/Inter-$(VERSION)-$(shell git rev-parse --short=10 HEAD)-extras.zip"
-
 zip_beta: \
 		$(FONTDIR)/var/InterV.var.ttf \
 		$(FONTDIR)/var/InterV.var.woff2 \
@@ -571,7 +567,6 @@ zip_beta: \
 # - step2 runs tests, then makes a zip archive and updates the website (docs/ dir.)
 
 DIST_ZIP = build/release/Inter-${VERSION}.zip
-DIST_ZIP_EXTRAS = build/release/Inter-${VERSION}-extras.zip
 
 dist: dist_preflight
 	@# rebuild since font version & ID is based on git hash
@@ -603,7 +598,6 @@ dist_step2: test
 
 dist_zip: | venv
 	. $(VENV) ; python misc/tools/patch-version.py misc/dist/inter.css
-	bash misc/makezip2.sh -extras "$(DIST_ZIP_EXTRAS)"
 	bash misc/makezip2.sh -reveal-in-finder "$(DIST_ZIP)"
 
 dist_docs:

misc/makezip2.sh

@@ -4,7 +4,6 @@ cd "$(dirname "$0")/.."
 
 OPT_HELP=
 OPT_REVEAL_IN_FINDER=false
-OPT_EXTRAS=false
 OUTFILE=
 
 # parse args
@@ -12,7 +11,6 @@ while [[ $# -gt 0 ]]; do
   case "$1" in
   -h|-help|--help)   OPT_HELP=0; shift;;
   -reveal-in-finder) OPT_REVEAL_IN_FINDER=true; shift;;
-  -extras|--extras)  OPT_EXTRAS=true; shift;;
   -*)
     echo "$0: Unknown option $1" >&2
     OPT_HELP=1
@@ -38,9 +36,6 @@ fi
 
 # tmp dir
 ZIPDIR=build/tmp/zip
-if $OPT_EXTRAS; then
-  ZIPDIR=build/tmp/zip-extras
-fi
 
 # convert relative path to absolute if needed
 OUTFILE_ABS=$OUTFILE
@@ -53,20 +48,16 @@ mkdir -p "$(dirname "$OUTFILE_ABS")" "$ZIPDIR"
 
 cp LICENSE.txt "$ZIPDIR/LICENSE.txt"
 
-if $OPT_EXTRAS; then
-  mkdir -p "$ZIPDIR/OTF" "$ZIPDIR/TTF" "$ZIPDIR/Web with TrueType hints"
 
-  cp misc/dist/extras-readme.txt             "$ZIPDIR/README.txt"
-  cp build/fonts/static/Inter-*.otf          "$ZIPDIR/OTF/" &
-  cp build/fonts/static-hinted/Inter-*.ttf   "$ZIPDIR/TTF/" &
-  cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/Web with TrueType hints/" &
-else
 mkdir -p "$ZIPDIR/Web"
 
 cp misc/dist/help.txt                     "$ZIPDIR/help.txt"
+
 cp build/fonts/static-hinted/Inter.ttc    "$ZIPDIR/Inter.ttc"
+
 cp build/fonts/var/InterV.var.ttf         "$ZIPDIR/Inter Variable.ttf"
 cp build/fonts/var/InterV-Italic.var.ttf  "$ZIPDIR/Inter Variable Italic.ttf"
+
 cp build/fonts/static/Inter-*.woff2       "$ZIPDIR/Web/" &
 cp build/fonts/var/Inter.var.woff2        "$ZIPDIR/Web/InterVariable.woff2"
 cp build/fonts/var/Inter-Italic.var.woff2 "$ZIPDIR/Web/InterVariable-Italic.woff2"
@@ -74,7 +65,17 @@ else
 
 . build/venv/bin/activate
 python misc/tools/patch-version.py "$ZIPDIR/Web/inter.css"
-fi
+
+mkdir -p "$ZIPDIR/extras/otf" \
+         "$ZIPDIR/extras/ttf" \
+         "$ZIPDIR/extras/woff with TT hints"
+
+cp misc/dist/extras-readme.txt             "$ZIPDIR/extras/README.txt"
+cp build/fonts/static/Inter-*.otf          "$ZIPDIR/extras/otf/" &
+cp build/fonts/static-hinted/Inter-*.ttf   "$ZIPDIR/extras/ttf/" &
+cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/extras/woff with TT hints/" &
+
+
 
 mkdir -p "$(dirname "$OUTFILE_ABS")"
 wait