From a889ac760f91c9094a6ef968fdacf0589f7b82b3 Mon Sep 17 00:00:00 2001 From: Lai Zenan Date: Mon, 9 Sep 2024 03:38:55 +0800 Subject: [PATCH] fix: remove the blocking deleted github repo --- .github/workflows/build.yml | 175 ++++++++++++++------------------- scripts/build.macos.release.sh | 2 +- scripts/rules_config.conf | 5 - 3 files changed, 77 insertions(+), 105 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbbe478c47..71ac817fce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,62 +12,64 @@ concurrency: 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-latest, linux, ARM] + # - arch: aarch64 + # artifact: subconverter_aarch64 + # os: [ubuntu-latest, linux, ARM64] + runs-on: ${{ matrix.os }} + name: Linux ${{ matrix.arch }} Build steps: - - uses: actions/checkout@v3 + - 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@v3 + uses: actions/upload-artifact@v4 with: - name: subconverter_linux32 + name: ${{ matrix.artifact }} path: subconverter/ - name: Package Release if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - run: tar czf subconverter_linux32.tar.gz subconverter + run: tar czf ${{ matrix.artifact }}.tar.gz subconverter - name: Draft Release - uses: softprops/action-gh-release@v1 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@v3 - - 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: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@v3 - with: - name: subconverter_linux64 - path: subconverter/ - - name: Package Release - if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - run: tar czf subconverter_linux64.tar.gz subconverter - - name: Draft Release - uses: softprops/action-gh-release@v1 - if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - with: - files: subconverter_linux64.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-13 + - arch: arm + artifact: subconverter_darwinarm + os: macos-14 + runs-on: ${{ matrix.os }} + name: macOS ${{ matrix.arch }} Build steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - 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 @@ -76,79 +78,54 @@ jobs: - name: Build run: bash scripts/build.macos.release.sh - name: Upload - uses: actions/upload-artifact@v3 - with: - name: subconverter_darwin64 - path: subconverter/ - - name: Package Release - if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - run: tar czf subconverter_darwin64.tar.gz subconverter - - name: Draft Release - uses: softprops/action-gh-release@v1 - if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - with: - files: subconverter_darwin64.tar.gz - draft: true - - windows64_build: - name: Windows x86_64 Build - runs-on: windows-latest - defaults: - run: - shell: msys2 {0} - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - uses: actions/setup-node@v3 - with: - node-version: '16' - - 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-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@v3 + uses: actions/upload-artifact@v4 with: - name: subconverter_win64 + name: ${{ matrix.artifact }} path: subconverter/ - name: Package Release if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - run: 7z a subconverter_win64.7z subconverter/ + run: tar czf ${{ matrix.artifact }}.tar.gz subconverter - name: Draft Release - uses: softprops/action-gh-release@v1 if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} + uses: softprops/action-gh-release@v2 with: - files: subconverter_win64.7z + files: ${{ matrix.artifact }}.tar.gz draft: true - - windows32_build: - name: Windows x86 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@v3 - - uses: actions/setup-python@v4 + - name: Checkout base + uses: actions/checkout@v4 + - name: Setup Python + uses: actions/setup-python@v5 with: python-version: '3.11' - - uses: actions/setup-node@v3 + - name: Setup Node.js + uses: actions/setup-node@v4 with: node-version: '16' - - uses: msys2/setup-msys2@v2 + - 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-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/') }} @@ -156,16 +133,16 @@ jobs: - name: Build run: bash scripts/build.windows.release.sh - name: Upload - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: subconverter_win32 + name: ${{ matrix.artifact }} path: subconverter/ - name: Package Release if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} - run: 7z a subconverter_win32.7z subconverter/ + run: 7z a ${{ matrix.artifact }}.7z subconverter/ - name: Draft Release - uses: softprops/action-gh-release@v1 if: ${{ github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') }} + uses: softprops/action-gh-release@v2 with: - files: subconverter_win32.7z - draft: true + files: ${{ matrix.artifact }}.7z + draft: true \ No newline at end of file diff --git a/scripts/build.macos.release.sh b/scripts/build.macos.release.sh index 529f7c1318..f10b49248b 100644 --- a/scripts/build.macos.release.sh +++ b/scripts/build.macos.release.sh @@ -41,7 +41,7 @@ sudo install -d /usr/local/include/date/ sudo install -m644 libcron/externals/date/include/date/* /usr/local/include/date/ cd .. -git clone https://github.com/ToruNiina/toml11 --depth=1 +git clone https://github.com/ToruNiina/toml11 --branch v3.8.1 --depth=1 cd toml11 cmake -DCMAKE_CXX_STANDARD=11 . sudo make install -j6 > /dev/null diff --git a/scripts/rules_config.conf b/scripts/rules_config.conf index 7cc6770723..65a3b0d865 100644 --- a/scripts/rules_config.conf +++ b/scripts/rules_config.conf @@ -12,11 +12,6 @@ match=Clash/config/** dest=base/config/ keep_tree=false -[DivineEngine] -url=https://github.com/DivineEngine/Profiles -commit=f4d75f7d48a3f42129e030bef751d4d22bca02da -match=Surge/Ruleset/** - [NobyDa] url=https://github.com/NobyDa/Script branch=master