Skip to content

Commit c0c9b9f

Browse files
committed
Merge tag 'v0.15.5' into cargo-workspace-inplace
2 parents b70acd7 + f673110 commit c0c9b9f

File tree

140 files changed

+8202
-7656
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+8202
-7656
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ task:
4242
- ./bootstrap.sh
4343
configure_script: |
4444
./configure MAKE=gmake \
45-
--enable-developer-mode LDOC=false LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false NPM=false DOCKER=false STYLUA=false \
45+
--enable-developer-mode LDOC=false LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false NPM=false DOCKER=false STYLUA=false TYPOS=false \
4646
--disable-font-variations \
4747
--with-system-lua-sources \
4848
--with-system-luarocks \

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
./bootstrap.sh
5050
./configure \
5151
--enable-developer-mode \
52-
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false \
52+
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat \
5353
--disable-font-variations \
5454
--with-manual \
5555
${{ matrix.configuration[1] }}
@@ -114,7 +114,7 @@ jobs:
114114
./bootstrap.sh
115115
./configure \
116116
--enable-developer-mode \
117-
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false FCMATCH=true PDFINFO=false CARGO=true \
117+
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat FCMATCH=true PDFINFO=false CARGO=true \
118118
--disable-font-variations \
119119
--with-system-lua-sources \
120120
--without-manual
@@ -144,7 +144,7 @@ jobs:
144144
.sources
145145
key: fonts-${{ hashFiles('Makefile-fonts') }}
146146
- name: Install Nix
147-
uses: DeterminateSystems/nix-installer-action@v12
147+
uses: DeterminateSystems/nix-installer-action@v13
148148
- name: Cache Nix dependencies
149149
uses: DeterminateSystems/magic-nix-cache-action@v7
150150
- name: Setup developer environment

.github/workflows/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
lua_modules
3434
key: luarocks-luajit-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
3535
- name: Setup ‘lua’
36-
uses: leafo/gh-actions-lua@v10
36+
uses: hishamhm/gh-actions-lua@master
3737
with:
3838
luaVersion: luajit
3939
luaCompileFlags: XCFLAGS=-fPIC
4040
- name: Setup ‘luarocks’
41-
uses: leafo/gh-actions-luarocks@v4
41+
uses: hishamhm/gh-actions-luarocks@master
4242
- name: Prep system Lua for use
4343
run: |
4444
luarocks install busted
@@ -60,7 +60,7 @@ jobs:
6060
run: |
6161
./bootstrap.sh
6262
./configure \
63-
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
63+
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
6464
--disable-font-variations \
6565
--without-manual
6666
- name: Make

.github/workflows/deploy.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
LUAROCKS=false \
4343
NIX=false \
4444
PDFINFO=false \
45-
STYLUA=false
45+
STYLUA=false \
46+
TYPOS=false
4647
- name: Publish Docker Image to GH Container Registry
4748
run: |
4849
make docker-build-push

.github/workflows/nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
- name: Install Nix
19-
uses: DeterminateSystems/nix-installer-action@v12
19+
uses: DeterminateSystems/nix-installer-action@v13
2020
- name: Cache Nix dependencies
2121
uses: DeterminateSystems/magic-nix-cache-action@v7
2222
# Upstream package sometimes has flags set that disable flake checking

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ jobs:
4646
sudo apt-get update
4747
sudo apt-get install fonts-sil-gentiumplus libarchive-tools libfontconfig1-dev libharfbuzz-dev libicu-dev libpng-dev poppler-utils
4848
- name: Setup ‘lua’
49-
uses: leafo/gh-actions-lua@v10
49+
uses: hishamhm/gh-actions-lua@master
5050
with:
5151
luaVersion: ${{ matrix.luaVersion[0] }}
5252
luaCompileFlags: ${{ matrix.luaVersion[1] }}
5353
- name: Setup ‘cargo’
5454
uses: actions-rs/toolchain@v1
5555
- name: Setup ‘luarocks’
56-
uses: leafo/gh-actions-luarocks@v4
56+
uses: hishamhm/gh-actions-luarocks@master
5757
- name: Prep system Lua for use
5858
run: |
5959
luarocks install busted
@@ -71,7 +71,7 @@ jobs:
7171
./bootstrap.sh
7272
./configure \
7373
${{ matrix.luaVersion[1] }} \
74-
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
74+
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
7575
--disable-font-variations \
7676
--with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
7777
--without-system-luarocks \

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ build-aux/ltsugar.m4
2121
build-aux/ltversion.m4
2222
build-aux/lt~obsolete.m4
2323
build-aux/missing
24-
build-aux/list-dist-files.sh
24+
build-aux/list-distfiles.sh
2525
tests/regressions.pl
2626

2727
# Other autojunk

0 commit comments

Comments
 (0)