Переглянути джерело

Auto-update libpng to v1.6.44 & update cross toolchain (#5234)

* Update libpng to v1.6.44

* update cross

---------

Co-authored-by: c8ef <[email protected]>
ruki 11 місяців тому
батько
коміт
ddf75103bc
2 змінених файлів з 7 додано та 6 видалено
  1. 6 6
      .github/workflows/cross.yml
  2. 1 0
      packages/l/libpng/xmake.lua

+ 6 - 6
.github/workflows/cross_musl.yml → .github/workflows/cross.yml

@@ -1,4 +1,4 @@
-name: Cross (Musl)
+name: Cross
 
 on:
   pull_request:
@@ -10,12 +10,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        cross: [arm-unknown-linux-musleabi, aarch64-unknown-linux-musl]
+        cross: [arm-none-linux-gnueabihf, aarch64-none-linux-gnu]
 
     runs-on: ${{ matrix.os }}
 
     concurrency:
-      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-Musl-${{ matrix.cross }}
+      group: ${{ github.ref }}-${{ github.base_ref }}-${{ github.head_ref }}-Cross-${{ matrix.cross }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v1
@@ -25,9 +25,9 @@ jobs:
 
       - name: Installation
         run: |
-          wget https://github.com/musl-cross/musl-cross/releases/download/20240903/${{ matrix.cross }}.tgz
-          tar -xvf ${{ matrix.cross }}.tgz
+          wget https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz
+          tar -xvf arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}.tar.xz
 
       - name: Tests
         run: |
-          xmake l ./scripts/test.lua -D -p cross --toolchain=muslcc --sdk=`pwd`/${{ matrix.cross }}
+          xmake l ./scripts/test.lua -D -p cross --sdk=`pwd`/arm-gnu-toolchain-13.3.rel1-x86_64-${{ matrix.cross }}

+ 1 - 0
packages/l/libpng/xmake.lua

@@ -6,6 +6,7 @@ package("libpng")
     add_urls("https://github.com/glennrp/libpng/archive/refs/tags/$(version).tar.gz")
     add_urls("https://github.com/glennrp/libpng.git")
 
+    add_versions("v1.6.44", "0ef5b633d0c65f780c4fced27ff832998e71478c13b45dfb6e94f23a82f64f7c")
     add_versions("v1.6.43", "fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a")
     add_versions("v1.6.42", "fe89de292e223829859d21990d9c4d6b7e30e295a268f6a53a022611aa98bd67")
     add_versions("v1.6.40", "62d25af25e636454b005c93cae51ddcd5383c40fa14aa3dae8f6576feb5692c2")