mirror of
https://github.com/rsms/inter.git
synced 2024-09-11 10:55:24 +03:00
tooling: revert "extras" zip distribution
This commit is contained in:
parent
9c484364cd
commit
899eca64b7
18
.github/workflows/build-fonts.yml
vendored
18
.github/workflows/build-fonts.yml
vendored
@ -71,21 +71,15 @@ jobs:
|
|||||||
- name: make zip
|
- name: make zip
|
||||||
run: |
|
run: |
|
||||||
ZIP=Inter-${{ env.inter_version }}.zip
|
ZIP=Inter-${{ env.inter_version }}.zip
|
||||||
ZIP_EXTRAS=Inter-${{ env.inter_version }}-extras.zip
|
|
||||||
echo "inter_zip=$ZIP" >> $GITHUB_ENV
|
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)
|
- name: Upload archive (unless tag)
|
||||||
if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
|
if: ${{ ! startsWith(github.ref, 'refs/tags/v') }}
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: "${{ env.inter_zip }}"
|
path: ${{ env.inter_zip }}
|
||||||
path: |
|
|
||||||
${{ env.inter_zip }}
|
|
||||||
${{ env.inter_zip_extras }}
|
|
||||||
retention-days: 1
|
retention-days: 1
|
||||||
|
|
||||||
- name: Create release (if tag)
|
- name: Create release (if tag)
|
||||||
@ -94,7 +88,5 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
prerelease: true
|
prerelease: true
|
||||||
name: "${{ env.inter_version }}"
|
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 }}
|
|
||||||
|
6
Makefile
6
Makefile
@ -550,10 +550,6 @@ zip: all
|
|||||||
bash misc/makezip2.sh -reveal-in-finder \
|
bash misc/makezip2.sh -reveal-in-finder \
|
||||||
"build/release/Inter-$(VERSION)-$(shell git rev-parse --short=10 HEAD).zip"
|
"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: \
|
zip_beta: \
|
||||||
$(FONTDIR)/var/InterV.var.ttf \
|
$(FONTDIR)/var/InterV.var.ttf \
|
||||||
$(FONTDIR)/var/InterV.var.woff2 \
|
$(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.)
|
# - step2 runs tests, then makes a zip archive and updates the website (docs/ dir.)
|
||||||
|
|
||||||
DIST_ZIP = build/release/Inter-${VERSION}.zip
|
DIST_ZIP = build/release/Inter-${VERSION}.zip
|
||||||
DIST_ZIP_EXTRAS = build/release/Inter-${VERSION}-extras.zip
|
|
||||||
|
|
||||||
dist: dist_preflight
|
dist: dist_preflight
|
||||||
@# rebuild since font version & ID is based on git hash
|
@# rebuild since font version & ID is based on git hash
|
||||||
@ -603,7 +598,6 @@ dist_step2: test
|
|||||||
|
|
||||||
dist_zip: | venv
|
dist_zip: | venv
|
||||||
. $(VENV) ; python misc/tools/patch-version.py misc/dist/inter.css
|
. $(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)"
|
bash misc/makezip2.sh -reveal-in-finder "$(DIST_ZIP)"
|
||||||
|
|
||||||
dist_docs:
|
dist_docs:
|
||||||
|
@ -4,7 +4,6 @@ cd "$(dirname "$0")/.."
|
|||||||
|
|
||||||
OPT_HELP=
|
OPT_HELP=
|
||||||
OPT_REVEAL_IN_FINDER=false
|
OPT_REVEAL_IN_FINDER=false
|
||||||
OPT_EXTRAS=false
|
|
||||||
OUTFILE=
|
OUTFILE=
|
||||||
|
|
||||||
# parse args
|
# parse args
|
||||||
@ -12,7 +11,6 @@ while [[ $# -gt 0 ]]; do
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
-h|-help|--help) OPT_HELP=0; shift;;
|
-h|-help|--help) OPT_HELP=0; shift;;
|
||||||
-reveal-in-finder) OPT_REVEAL_IN_FINDER=true; shift;;
|
-reveal-in-finder) OPT_REVEAL_IN_FINDER=true; shift;;
|
||||||
-extras|--extras) OPT_EXTRAS=true; shift;;
|
|
||||||
-*)
|
-*)
|
||||||
echo "$0: Unknown option $1" >&2
|
echo "$0: Unknown option $1" >&2
|
||||||
OPT_HELP=1
|
OPT_HELP=1
|
||||||
@ -38,9 +36,6 @@ fi
|
|||||||
|
|
||||||
# tmp dir
|
# tmp dir
|
||||||
ZIPDIR=build/tmp/zip
|
ZIPDIR=build/tmp/zip
|
||||||
if $OPT_EXTRAS; then
|
|
||||||
ZIPDIR=build/tmp/zip-extras
|
|
||||||
fi
|
|
||||||
|
|
||||||
# convert relative path to absolute if needed
|
# convert relative path to absolute if needed
|
||||||
OUTFILE_ABS=$OUTFILE
|
OUTFILE_ABS=$OUTFILE
|
||||||
@ -53,28 +48,34 @@ mkdir -p "$(dirname "$OUTFILE_ABS")" "$ZIPDIR"
|
|||||||
|
|
||||||
cp LICENSE.txt "$ZIPDIR/LICENSE.txt"
|
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"
|
mkdir -p "$ZIPDIR/Web"
|
||||||
cp build/fonts/static/Inter-*.otf "$ZIPDIR/OTF/" &
|
|
||||||
cp build/fonts/static-hinted/Inter-*.ttf "$ZIPDIR/TTF/" &
|
cp misc/dist/help.txt "$ZIPDIR/help.txt"
|
||||||
cp build/fonts/static-hinted/Inter-*.woff2 "$ZIPDIR/Web with TrueType hints/" &
|
|
||||||
else
|
cp build/fonts/static-hinted/Inter.ttc "$ZIPDIR/Inter.ttc"
|
||||||
mkdir -p "$ZIPDIR/Web"
|
|
||||||
|
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"
|
||||||
|
cp misc/dist/inter.css "$ZIPDIR/Web/"
|
||||||
|
|
||||||
|
. build/venv/bin/activate
|
||||||
|
python misc/tools/patch-version.py "$ZIPDIR/Web/inter.css"
|
||||||
|
|
||||||
|
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/" &
|
||||||
|
|
||||||
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"
|
|
||||||
cp misc/dist/inter.css "$ZIPDIR/Web/"
|
|
||||||
|
|
||||||
. build/venv/bin/activate
|
|
||||||
python misc/tools/patch-version.py "$ZIPDIR/Web/inter.css"
|
|
||||||
fi
|
|
||||||
|
|
||||||
mkdir -p "$(dirname "$OUTFILE_ABS")"
|
mkdir -p "$(dirname "$OUTFILE_ABS")"
|
||||||
wait
|
wait
|
||||||
|
Loading…
Reference in New Issue
Block a user