Skip to content

Commit

Permalink
Merge tag 'v0.15.5' into cargo-workspace-inplace
Browse files Browse the repository at this point in the history
  • Loading branch information
alerque committed Oct 2, 2024
2 parents b70acd7 + f673110 commit c0c9b9f
Show file tree
Hide file tree
Showing 140 changed files with 8,202 additions and 7,656 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ task:
- ./bootstrap.sh
configure_script: |
./configure MAKE=gmake \
--enable-developer-mode LDOC=false LUAROCKS=false LUACHECK=false BUSTED=false DELTA=cat PDFINFO=false NIX=false NPM=false DOCKER=false STYLUA=false \
--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 \
--disable-font-variations \
--with-system-lua-sources \
--with-system-luarocks \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
./bootstrap.sh
./configure \
--enable-developer-mode \
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false \
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat \
--disable-font-variations \
--with-manual \
${{ matrix.configuration[1] }}
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
./bootstrap.sh
./configure \
--enable-developer-mode \
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false FCMATCH=true PDFINFO=false CARGO=true \
BUSTED=false DELTA=false LDOC=false LUACHECK=false NIX=false STYLUA=false TYPOS=cat FCMATCH=true PDFINFO=false CARGO=true \
--disable-font-variations \
--with-system-lua-sources \
--without-manual
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
.sources
key: fonts-${{ hashFiles('Makefile-fonts') }}
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v12
uses: DeterminateSystems/nix-installer-action@v13
- name: Cache Nix dependencies
uses: DeterminateSystems/magic-nix-cache-action@v7
- name: Setup developer environment
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:
lua_modules
key: luarocks-luajit-${{ hashFiles('Makefile-luarocks', 'sile.rockspec.in') }}
- name: Setup ‘lua’
uses: leafo/gh-actions-lua@v10
uses: hishamhm/gh-actions-lua@master
with:
luaVersion: luajit
luaCompileFlags: XCFLAGS=-fPIC
- name: Setup ‘luarocks’
uses: leafo/gh-actions-luarocks@v4
uses: hishamhm/gh-actions-luarocks@master
- name: Prep system Lua for use
run: |
luarocks install busted
Expand All @@ -60,7 +60,7 @@ jobs:
run: |
./bootstrap.sh
./configure \
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
--disable-font-variations \
--without-manual
- name: Make
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ jobs:
LUAROCKS=false \
NIX=false \
PDFINFO=false \
STYLUA=false
STYLUA=false \
TYPOS=false
- name: Publish Docker Image to GH Container Registry
run: |
make docker-build-push
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
with:
fetch-depth: 0
- name: Install Nix
uses: DeterminateSystems/nix-installer-action@v12
uses: DeterminateSystems/nix-installer-action@v13
- name: Cache Nix dependencies
uses: DeterminateSystems/magic-nix-cache-action@v7
# Upstream package sometimes has flags set that disable flake checking
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ jobs:
sudo apt-get update
sudo apt-get install fonts-sil-gentiumplus libarchive-tools libfontconfig1-dev libharfbuzz-dev libicu-dev libpng-dev poppler-utils
- name: Setup ‘lua’
uses: leafo/gh-actions-lua@v10
uses: hishamhm/gh-actions-lua@master
with:
luaVersion: ${{ matrix.luaVersion[0] }}
luaCompileFlags: ${{ matrix.luaVersion[1] }}
- name: Setup ‘cargo’
uses: actions-rs/toolchain@v1
- name: Setup ‘luarocks’
uses: leafo/gh-actions-luarocks@v4
uses: hishamhm/gh-actions-luarocks@master
- name: Prep system Lua for use
run: |
luarocks install busted
Expand All @@ -71,7 +71,7 @@ jobs:
./bootstrap.sh
./configure \
${{ matrix.luaVersion[1] }} \
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false \
--enable-developer-mode LDOC=false LUACHECK=false NIX=false DELTA=cat STYLUA=false TYPOS=false \
--disable-font-variations \
--with${{ !startsWith(matrix.luaVersion[0], 'luajit') && 'out' || '' }}-luajit \
--without-system-luarocks \
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build-aux/ltsugar.m4
build-aux/ltversion.m4
build-aux/lt~obsolete.m4
build-aux/missing
build-aux/list-dist-files.sh
build-aux/list-distfiles.sh
tests/regressions.pl

# Other autojunk
Expand Down
Loading

0 comments on commit c0c9b9f

Please sign in to comment.