Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
- name: Setup Meson
run: |
python -m pip install --upgrade pip setuptools
pip install meson==1.9.2
pip install meson

- name: Setup MSVC
if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true
Expand All @@ -100,15 +100,15 @@ jobs:
run: |
choco install ninja innosetup

$moonscripturl = "https://github.com/leafo/moonscript/releases/download/win32-v0.5.0/moonscript-187bac54ee5a7450013e9c38e005a0e671b76f45.zip"
$moonscripturl = "https://github.com/leafo/moonscript/releases/download/v0.6.0/moonscript-v0.6.0-windows-x86_64.zip"
mkdir moonscript
Invoke-WebRequest -Uri $moonscripturl -OutFile ".\moonscript\moonscript.zip"
pushd moonscript
7z e moonscript.zip
Get-Location | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
popd

$gettexturl = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.26-v1.17/gettext0.26-iconv1.17-static-64.zip"
$gettexturl = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v1.0-v1.18-r3/gettext1.0-iconv1.18-static-64.zip"
Invoke-WebRequest -Uri $gettexturl -OutFile ".\gettext.zip"
Expand-Archive ".\gettext.zip" -DestinationPath gettext
pushd gettext/bin
Expand Down Expand Up @@ -154,15 +154,15 @@ jobs:
run: cd build && ninja win-portable

- name: Upload artifacts - win_installer
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: matrix.config.os == 'windows-latest'
with:
name: ${{ matrix.config.name }} - installer
path: build/Aegisub-*.exe
if-no-files-found: error

- name: Upload artifacts - portable.zip
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: matrix.config.os == 'windows-latest'
with:
name: ${{ matrix.config.name }} - portable
Expand All @@ -176,7 +176,7 @@ jobs:
meson compile osx-build-dmg -C build

- name: Upload artifacts - macOS dmg
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: startsWith(matrix.config.os, 'macos-')
with:
name: ${{ matrix.config.name }} - installer
Expand All @@ -198,7 +198,7 @@ jobs:
test -e distcheck/*/subprojects/LuaJIT*/meson.build

- name: Upload artifacts - tarball
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
with:
name: Source Tarball
Expand Down
21 changes: 11 additions & 10 deletions subprojects/expat.wrap
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[wrap-file]
directory = expat-2.7.3
source_url = https://github.com/libexpat/libexpat/releases/download/R_2_7_3/expat-2.7.3.tar.xz
source_filename = expat-2.7.3.tar.bz2
source_hash = 71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/expat_2.7.3-1/expat-2.7.3.tar.bz2
patch_filename = expat_2.7.3-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.3-1/get_patch
patch_hash = e870eb4b2e3c142ce1d18ed24309aa40e07c6c911a4625fa1c6fc493ba18153a
wrapdb_version = 2.7.3-1
directory = expat-2.7.4
source_url = https://github.com/libexpat/libexpat/releases/download/R_2_7_4/expat-2.7.4.tar.xz
source_filename = expat-2.7.4.tar.xz
source_hash = 9e9cabb457c1e09de91db2706d8365645792638eb3be1f94dbb2149301086ac0
source_fallback_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.4-1/get_source/expat-2.7.4.tar.xz
patch_filename = expat_2.7.4-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/expat_2.7.4-1/get_patch
patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/expat_2.7.4-1/expat_2.7.4-1_patch.zip
patch_hash = 7bcf8e279b4403bc68b7d22929fd51d4c2397dee0ccb8dbf7cfc4f7ed302aecb
wrapdb_version = 2.7.4-1

[provide]
expat = expat_dep
dependency_names = expat
20 changes: 10 additions & 10 deletions subprojects/libpng.wrap
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[wrap-file]
directory = libpng-1.6.52
source_url = https://github.com/pnggroup/libpng/archive/v1.6.52.tar.gz
source_filename = libpng-1.6.52.tar.gz
source_hash = 07098f37e7b7570fc06d2ccbaaf5a47e9344fc36e773e312e334a083689a6212
source_fallback_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.52-1/get_source/libpng-1.6.52.tar.gz
patch_filename = libpng_1.6.52-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.52-1/get_patch
patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.52-1/libpng_1.6.52-1_patch.zip
patch_hash = f25b75488a22ec9ced17d86ac30370e0f6a41d968d22aa1a5952df99fa9b0219
wrapdb_version = 1.6.52-1
directory = libpng-1.6.55
source_url = https://github.com/pnggroup/libpng/archive/v1.6.55.tar.gz
source_filename = libpng-1.6.55.tar.gz
source_hash = 71a2c5b1218f60c4c6d2f1954c7eb20132156cae90bdb90b566c24db002782a6
source_fallback_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.55-1/get_source/libpng-1.6.55.tar.gz
patch_filename = libpng_1.6.55-1_patch.zip
patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.55-1/get_patch
patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.55-1/libpng_1.6.55-1_patch.zip
patch_hash = d5754df441e93e2e2f1dc176cc86f45ec0ef2914e9c77c1e8013c68b106d0ff5
wrapdb_version = 1.6.55-1

[provide]
dependency_names = libpng
Loading