Skip to content

Commit 3b2d641

Browse files
committed
b
1 parent 9af6e32 commit 3b2d641

2 files changed

Lines changed: 8 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,11 +1220,6 @@ jobs:
12201220
COMMON_CMAKE_OPTIONS: -T ${{ matrix.os-compiler.toolset-version }},host=x64 -DCMAKE_INSTALL_PREFIX=install
12211221
steps:
12221222
- uses: actions/checkout@v4
1223-
- name: patch-windows-sdk
1224-
if: matrix.os-compiler.msvc-version == 'vs2022'
1225-
run: |
1226-
cd "C:\Program Files (x86)"
1227-
& "C:\Program Files\Git\usr\bin\patch.exe" -p0 -i $env:GITHUB_WORKSPACE\fix-windows-sdk-26100-arm64-wchar.patch
12281223
- uses: actions/download-artifact@v4
12291224
with:
12301225
name: opencv-mobile-${{ matrix.opencv-version }}-source
@@ -1693,8 +1688,8 @@ jobs:
16931688
single-core: true
16941689
cmake-toolchain: arm-openwrt-linux-muslgnueabi.toolchain.cmake
16951690
setup-toolchain-cmd: |
1696-
wget -q https://github.com/YuzukiHD/Yuzukilizard/releases/download/Toolchains/toolchain-sunxi-musl-gcc-830.tar.gz
1697-
tar -xf toolchain-sunxi-musl-gcc-830.tar.gz
1691+
wget -q https://github.com/YuzukiHD/sunxi-bsp-toolchains/releases/download/1.0.0/toolchain-sunxi-musl-arm-gcc-830.tar.gz
1692+
tar -xf toolchain-sunxi-musl-arm-gcc-830.tar.gz
16981693
setup-env-cmd: |
16991694
export TOOLCHAIN_ROOT_PATH=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
17001695
export STAGING_DIR=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
@@ -1707,8 +1702,8 @@ jobs:
17071702
single-core: true
17081703
cmake-toolchain: arm-openwrt-linux-muslgnueabi.toolchain.cmake
17091704
setup-toolchain-cmd: |
1710-
wget -q https://github.com/YuzukiHD/Yuzukilizard/releases/download/Toolchains/toolchain-sunxi-musl-gcc-830.tar.gz
1711-
tar -xf toolchain-sunxi-musl-gcc-830.tar.gz
1705+
wget -q https://github.com/YuzukiHD/sunxi-bsp-toolchains/releases/download/1.0.0/toolchain-sunxi-musl-arm-gcc-830.tar.gz
1706+
tar -xf toolchain-sunxi-musl-arm-gcc-830.tar.gz
17121707
setup-env-cmd: |
17131708
export TOOLCHAIN_ROOT_PATH=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
17141709
export STAGING_DIR=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain

.github/workflows/release.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,11 +1361,6 @@ jobs:
13611361
COMMON_CMAKE_OPTIONS: -T ${{ matrix.os-compiler.toolset-version }},host=x64 -DCMAKE_INSTALL_PREFIX=install
13621362
steps:
13631363
- uses: actions/checkout@v4
1364-
- name: patch-windows-sdk
1365-
if: matrix.os-compiler.msvc-version == 'vs2022'
1366-
run: |
1367-
cd "C:\Program Files (x86)"
1368-
& "C:\Program Files\Git\usr\bin\patch.exe" -p0 -i $env:GITHUB_WORKSPACE\fix-windows-sdk-26100-arm64-wchar.patch
13691364
- uses: actions/download-artifact@v4
13701365
with:
13711366
name: opencv-mobile-${{ matrix.opencv-version }}-source
@@ -1834,8 +1829,8 @@ jobs:
18341829
single-core: true
18351830
cmake-toolchain: arm-openwrt-linux-muslgnueabi.toolchain.cmake
18361831
setup-toolchain-cmd: |
1837-
wget -q https://github.com/YuzukiHD/Yuzukilizard/releases/download/Toolchains/toolchain-sunxi-musl-gcc-830.tar.gz
1838-
tar -xf toolchain-sunxi-musl-gcc-830.tar.gz
1832+
wget -q https://github.com/YuzukiHD/sunxi-bsp-toolchains/releases/download/1.0.0/toolchain-sunxi-musl-arm-gcc-830.tar.gz
1833+
tar -xf toolchain-sunxi-musl-arm-gcc-830.tar.gz
18391834
setup-env-cmd: |
18401835
export TOOLCHAIN_ROOT_PATH=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
18411836
export STAGING_DIR=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
@@ -1848,8 +1843,8 @@ jobs:
18481843
single-core: true
18491844
cmake-toolchain: arm-openwrt-linux-muslgnueabi.toolchain.cmake
18501845
setup-toolchain-cmd: |
1851-
wget -q https://github.com/YuzukiHD/Yuzukilizard/releases/download/Toolchains/toolchain-sunxi-musl-gcc-830.tar.gz
1852-
tar -xf toolchain-sunxi-musl-gcc-830.tar.gz
1846+
wget -q https://github.com/YuzukiHD/sunxi-bsp-toolchains/releases/download/1.0.0/toolchain-sunxi-musl-arm-gcc-830.tar.gz
1847+
tar -xf toolchain-sunxi-musl-arm-gcc-830.tar.gz
18531848
setup-env-cmd: |
18541849
export TOOLCHAIN_ROOT_PATH=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain
18551850
export STAGING_DIR=$GITHUB_WORKSPACE/toolchain-sunxi-musl-gcc-830/toolchain

0 commit comments

Comments
 (0)