[pull] master from tindy2013:master

.github/workflows/build.yml

@@ -1,206 +1,148 @@
 name: GitHub CI
-on: [push]
+on: 
+  push:
+    branches: [ master ]
+    tags:
+      - '**'
+  workflow_dispatch:
+  pull_request:
 
 concurrency: 
   group: ${{ github.ref }}-${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
-  linux32_build:
-    name: Linux x86 Build
-    runs-on: ubuntu-latest
+  linux_build:
+    strategy:
+      matrix:
+        include:
+          - arch: x86
+            artifact: subconverter_linux32
+            os: ubuntu-latest
+          - arch: amd64
+            artifact: subconverter_linux64
+            os: ubuntu-latest
+          - arch: armv7
+            artifact: subconverter_armv7
+            os: ubuntu-24.04-arm
+          - arch: aarch64
+            artifact: subconverter_aarch64
+            os: ubuntu-24.04-arm
+    runs-on: ${{ matrix.os }}
+    name: Linux ${{ matrix.arch }} Build
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout base
+      uses: actions/checkout@v4
     - name: Add commit id into version
       if: ${{ !startsWith(github.ref, 'refs/tags/') }}
       run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
     - name: Build
-      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:x86-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
+      run: docker run --rm -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:${{ matrix.arch }}-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
     - name: Upload
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: subconverter_linux32
+        name: ${{ matrix.artifact }}
         path: subconverter/
     - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: tar czf subconverter_linux32.tar.gz subconverter
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      run: tar czf ${{ matrix.artifact }}.tar.gz subconverter
     - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      uses: softprops/action-gh-release@v2
       with:
-        files: subconverter_linux32.tar.gz
-        draft: true
-
-  linux64_build:
-    name: Linux x86_64 Build
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-    - name: Build
-      run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:amd64-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-    - name: Upload
-      uses: actions/upload-artifact@v1
-      with:
-        name: subconverter_linux64
-        path: subconverter/
-    - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: tar czf subconverter_linux64.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: subconverter_linux64.tar.gz
-        draft: true
-
-  armv7_build:
-    name: Linux armv7 Build
-    runs-on: [self-hosted, linux, ARM64]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-    - name: Build
-      run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:armv7-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-    - name: Upload
-      uses: actions/upload-artifact@v1
-      with:
-        name: subconverter_armv7
-        path: subconverter/
-    - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: tar czf subconverter_armv7.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: subconverter_armv7.tar.gz
-        draft: true
-
-  aarch64_build:
-    name: Linux aarch64 Build
-    runs-on: [self-hosted, linux, ARM64]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-    - name: Build
-      run: docker run -v $GITHUB_WORKSPACE:/root/workdir multiarch/alpine:aarch64-latest-stable /bin/sh -c "apk add bash git nodejs npm && cd /root/workdir && chmod +x scripts/build.alpine.release.sh && bash scripts/build.alpine.release.sh"
-    - name: Upload
-      uses: actions/upload-artifact@v1
-      with:
-        name: subconverter_aarch64
-        path: subconverter/
-    - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: tar czf subconverter_aarch64.tar.gz subconverter
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: subconverter_aarch64.tar.gz
+        files: ${{ matrix.artifact }}.tar.gz
         draft: true
 
   macos_build:
-    name: macOS Build
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        include:
+          - arch: x86
+            artifact: subconverter_darwin64
+            os: macos-26-intel
+          - arch: arm
+            artifact: subconverter_darwinarm
+            os: macos-26
+    runs-on: ${{ matrix.os }}
+    name: macOS ${{ matrix.arch }} Build
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout base
+      uses: actions/checkout@v4
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.11'
     - name: Add commit id into version
       if: ${{ !startsWith(github.ref, 'refs/tags/') }}
       run: SHA=$(git rev-parse --short HEAD) && sed -i -e 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
     - name: Build
       run: bash scripts/build.macos.release.sh
     - name: Upload
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: subconverter_darwin64
+        name: ${{ matrix.artifact }}
         path: subconverter/
     - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: tar czf subconverter_darwin64.tar.gz subconverter
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      run: tar czf ${{ matrix.artifact }}.tar.gz subconverter
     - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      uses: softprops/action-gh-release@v2
       with:
-        files: subconverter_darwin64.tar.gz
+        files: ${{ matrix.artifact }}.tar.gz
         draft: true
-
-  windows64_build:
-    name: Windows x86_64 Build
+
+  windows_build:
+    strategy:
+      matrix:
+        include:
+          - arch: x86
+            artifact: subconverter_win32
+            env: i686
+            msystem: MINGW32
+          - arch: amd64
+            artifact: subconverter_win64
+            env: x86_64
+            msystem: MINGW64
     runs-on: windows-latest
+    name: Windows ${{ matrix.arch }} Build
     defaults:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2-beta
+    - name: Checkout base
+      uses: actions/checkout@v4
+    - name: Setup Python
+      uses: actions/setup-python@v5
       with:
-        node-version: '12'
-    - uses: msys2/setup-msys2@v2
-      with:
-        update: true
-        install: base-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-cmake mingw-w64-x86_64-libevent mingw-w64-x86_64-pcre2 patch
-        msystem: MINGW64
-        path-type: inherit
-    - name: Add commit id into version
-      if: ${{ !startsWith(github.ref, 'refs/tags/') }}
-      run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
-    - name: Build
-      run: bash scripts/build.windows.release.sh
-    - name: Upload
-      uses: actions/upload-artifact@v1
-      with:
-        name: subconverter_win64
-        path: subconverter/
-    - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: 7z a subconverter_win64.7z subconverter/
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
-      with:
-        files: subconverter_win64.7z
-        draft: true
-
-  windows32_build:
-    name: Windows x86 Build
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v2-beta
+        python-version: '3.11'
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
       with:
-        node-version: '12'
-    - uses: msys2/setup-msys2@v2
+        node-version: '16'
+    - name: Setup MSYS2
+      uses: msys2/setup-msys2@v2
       with:
         update: true
-        install: base-devel git mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-libevent mingw-w64-i686-pcre2 patch
-        msystem: MINGW32
+        install: base-devel git mingw-w64-${{ matrix.env }}-gcc mingw-w64-${{ matrix.env }}-cmake mingw-w64-${{ matrix.env }}-pcre2 patch
+        msystem: ${{ matrix.msystem }}
         path-type: inherit
     - name: Add commit id into version
       if: ${{ !startsWith(github.ref, 'refs/tags/') }}
       run: SHA=$(git rev-parse --short HEAD) && sed -i 's/\(v[0-9]\.[0-9]\.[0-9]\)/\1-'"$SHA"'/' src/version.h
     - name: Build
       run: bash scripts/build.windows.release.sh
     - name: Upload
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
-        name: subconverter_win32
+        name: ${{ matrix.artifact }}
         path: subconverter/
     - name: Package Release
-      if: startsWith(github.ref, 'refs/tags/')
-      run: 7z a subconverter_win32.7z subconverter/
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      run: 7z a ${{ matrix.artifact }}.7z subconverter/
     - name: Draft Release
-      uses: softprops/action-gh-release@v1
-      if: startsWith(github.ref, 'refs/tags/')
+      if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }}
+      uses: softprops/action-gh-release@v2
       with:
-        files: subconverter_win32.7z
+        files: ${{ matrix.artifact }}.7z
         draft: true