Skip to content

Commit 3bb8c90

Browse files
author
cranko
committed
Release commit created with Cranko.
+++ cranko-release-info-v1 [[projects]] qnames = ["tectonic_xdv", "cargo"] version = "0.1.10" age = 6 [[projects]] qnames = ["tectonic_cfg_support", "cargo"] version = "0.1.1" age = 6 [[projects]] qnames = ["tectonic", "cargo"] version = "0.4.1" age = 0 +++
2 parents 1b32993 + 9ddff85 commit 3bb8c90

File tree

6 files changed

+90
-19
lines changed

6 files changed

+90
-19
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# tectonic 0.4.1 (2021-01-03)
2+
3+
- Add support for aarch64-apple-darwin when building with vcpkg
4+
- Prototype release automation infrastructure to update the new
5+
[tectonic-bin](https://aur.archlinux.org/packages/tectonic-bin/) AUR package.
6+
17
# tectonic 0.4.0 (2020-12-28)
28

39
- Introduce a prototype new “V2” command line interface, accessible by running

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[package]
66
name = "tectonic"
7-
version = "0.4.0"
7+
version = "0.4.1"
88
authors = ["Peter Williams <[email protected]>"]
99
build = "build.rs"
1010
description = """
@@ -88,10 +88,11 @@ tokio = "0.1.22"
8888

8989
[package.metadata.vcpkg]
9090
git = "https://github.com/microsoft/vcpkg"
91-
rev = "b7056e9f1f34f18b6648b1f1d9c4e9d31f04e91c"
91+
rev = "50ea8c0ab7aca3bb9245bba7fc877ad2f2a4464c"
9292

9393
[package.metadata.vcpkg.target]
9494
x86_64-apple-darwin = { install = ["freetype","harfbuzz[icu,graphite2]"] }
95+
aarch64-apple-darwin = { triplet = "arm64-osx", install = ["freetype","harfbuzz[icu,graphite2]"] }
9596
x86_64-unknown-linux-gnu = { install = ["fontconfig","freetype","harfbuzz[icu,graphite2]"] }
9697
x86_64-pc-windows-msvc = { triplet = "x64-windows-static", install = ["fontconfig","freetype","harfbuzz[icu,graphite2]"] }
9798

dist/arch/PKGBUILD.bin.in

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Maintainer: lmartinez-mirror <[email protected]>
2+
# Contributor: tectonic-deploy <[email protected]>
3+
4+
# The master version of this file is maintained here:
5+
#
6+
# https://github.com/tectonic-typesetting/tectonic/blob/master/dist/arch/PKGBUILD.bin.in
7+
#
8+
# The version on aur.archlinux.org is updated automatically by the Tectonic
9+
# CI/CD system when new versions are released. Pull requests should be filed
10+
# against Tectonic if the settings in this file need changing.
11+
12+
pkgname=tectonic-bin
13+
_pkgname=tectonic
14+
pkgver=@version@
15+
pkgrel=0
16+
pkgdesc='Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTex and TeXLive (binary release)'
17+
arch=('x86_64' 'armv7h')
18+
url='https://github.com/tectonic-typesetting/tectonic'
19+
license=('MIT')
20+
depends=('fontconfig' 'harfbuzz-icu' 'openssl')
21+
provides=('tectonic')
22+
conflicts=('tectonic')
23+
source=("https://raw.githubusercontent.com/tectonic-typesetting/tectonic/master/LICENSE")
24+
source_x86_64=("$_pkgname-$pkgver.tar.gz::$url/releases/download/$_pkgname%40$pkgver/$_pkgname-$pkgver-x86_64-unknown-linux-gnu.tar.gz")
25+
source_armv7h=("$_pkgname-$pkgver.tar.gz::$url/releases/download/$_pkgname%40$pkgver/$_pkgname-$pkgver-arm-unknown-linux-musleabihf.tar.gz")
26+
sha512sums=('5d2f16e9171ba223b0d9d12b0c022718e02b2a8738ec4a664b9eb2ca19d7b67f178f6606edd75a8201e1ab99a88937b9e4c4d01e4a3cdf0ccfedb536207db0a3')
27+
sha512sums_x86_64=('@x86_64_sha512@')
28+
sha512sums_armv7h=('@armv7h_sha512@')
29+
30+
package() {
31+
install -Dm755 tectonic -t "$pkgdir/usr/bin/"
32+
install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname/"
33+
}

dist/arch/PKGBUILD.in renamed to dist/arch/PKGBUILD.src.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44

55
# The master version of this file is maintained here:
66
#
7-
# https://github.com/tectonic-typesetting/tectonic/blob/master/dist/arch/PKGBUILD.in
7+
# https://github.com/tectonic-typesetting/tectonic/blob/master/dist/arch/PKGBUILD.src.in
88
#
99
# The version on aur.archlinux.org is updated automatically by the Tectonic
10-
# CI/CD system # when new versions are released.
10+
# CI/CD system when new versions are released. Pull requests should be filed
11+
# against Tectonic if the settings in this file need changing.
1112

1213
pkgname=tectonic
1314
pkgver=@version@
@@ -19,7 +20,7 @@ license=('MIT')
1920
depends=('fontconfig' 'harfbuzz-icu' 'openssl')
2021
makedepends=('rust' 'gcc' 'pkg-config')
2122
source=("$pkgname-$pkgver.tar.gz::https://crates.io/api/v1/crates/$pkgname/$pkgver/download")
22-
sha512sums=('@sha512@')
23+
sha512sums=('@source_sha512@')
2324

2425
build() {
2526
cd $pkgname-$pkgver

dist/arch/deploy.sh

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
# Copyright 2018-2020 the Tectonic Project
33
# Licensed under the MIT license
44

5-
# Auto-update the Arch Linux AUR repo for Tectonic. This script is invoked in
5+
# Auto-update the Arch Linux AUR repos for Tectonic. This script is invoked in
66
# the CI/CD pipeline when a new release of the main Tectonic package has been
7-
# made. It must be called *after* the Crates.io package has been updated.
7+
# made. It must be called *after* the Crates.io packages have been updated and
8+
# the GitHub release artifacts have been uploaded.
89

910
set -xeuo pipefail
1011
cd "$(dirname $0)"
@@ -15,29 +16,58 @@ if [ ! -f deploy_key ] ; then
1516
fi
1617

1718
# Get the settings that we need
19+
1820
version="$(cranko show version tectonic)"
21+
1922
url="https://crates.io/api/v1/crates/tectonic/$version/download"
2023
wget -q --progress=dot "$url" -O tectonic.crate.gz
21-
sha512="$(sha512sum tectonic.crate.gz |cut -d' ' -f1)"
24+
source_sha512="$(sha512sum tectonic.crate.gz |cut -d' ' -f1)"
25+
26+
url="https://github.com/tectonic-typesetting/tectonic/releases/download/tectonic%40$version/tectonic-$version-x86_64-unknown-linux-gnu.tar.gz"
27+
wget -q --progress=dot "$url" -O x86_64.tar.gz
28+
x86_64_sha512="$(sha512sum x86_64.tar.gz |cut -d' ' -f1)"
29+
30+
url="https://github.com/tectonic-typesetting/tectonic/releases/download/tectonic%40$version/tectonic-$version-arm-unknown-linux-musleabihf.tar.gz"
31+
wget -q --progress=dot "$url" -O armv7h.tar.gz
32+
armv7h_sha512="$(sha512sum armv7h.tar.gz |cut -d' ' -f1)"
2233

2334
# Set up to run makepkg
35+
2436
wget https://www.archlinux.org/packages/core/x86_64/pacman/download/ -O pacman.pkg.tar.zst
2537
tar -I zstd -xf pacman.pkg.tar.zst
2638
bindir="$(pwd)/usr/bin"
2739
export PATH="$bindir:$PATH"
2840
export LIBRARY="$(pwd)/usr/share/makepkg"
2941
config="$(pwd)/etc/makepkg.conf"
3042

31-
# Get the repo
43+
# Get the repos
44+
3245
export GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i $(pwd)/deploy_key"
33-
git clone ssh://[email protected]/tectonic.git aur
46+
git clone ssh://[email protected]/tectonic.git aur-src
47+
git clone ssh://[email protected]/tectonic-bin.git aur-bin
48+
49+
# Update them
50+
51+
sed -e "s|@version@|$version|g" \
52+
-e "s|@source_sha512@|$source_sha512|g" \
53+
PKGBUILD.src.in >aur-src/PKGBUILD
54+
55+
(cd aur-src \
56+
&& /bin/bash "$bindir/makepkg" --config="$config" --printsrcinfo >.SRCINFO \
57+
&& git add PKGBUILD .SRCINFO \
58+
&& git commit -m "Release $version")
59+
60+
sed -e "s|@version@|$version|g" \
61+
-e "s|@x86_64_sha512@|$x86_64_sha512|g" \
62+
-e "s|@armv7h_sha512@|$armv7h_sha512|g" \
63+
PKGBUILD.bin.in >aur-bin/PKGBUILD
64+
65+
(cd aur-bin \
66+
&& /bin/bash "$bindir/makepkg" --config="$config" --printsrcinfo >.SRCINFO \
67+
&& git add PKGBUILD .SRCINFO \
68+
&& git commit -m "Release $version")
3469

35-
# Update it
36-
sed -e "s|@version@|$version|g" -e "s|@sha512@|$sha512|g" PKGBUILD.in >aur/PKGBUILD
37-
cd aur
38-
/bin/bash "$bindir/makepkg" --config="$config" --printsrcinfo >.SRCINFO
39-
git add PKGBUILD .SRCINFO
40-
git commit -m "Release $version"
70+
# Deploy
4171

42-
# Deploy to AUR
43-
git push origin master
72+
(cd aur-src && git push origin master)
73+
(cd aur-bin && git push origin master)

0 commit comments

Comments
 (0)