From 5894dcdbed6d15d7bee1a38f52a9eede7eb9ebd8 Mon Sep 17 00:00:00 2001 From: benjaminwan Date: Sun, 28 Jul 2024 09:59:37 +0800 Subject: [PATCH] update builder, rename output folder --- .github/workflows/macos.yml | 7 ++++--- .github/workflows/musl-gcc.yml | 9 +++++---- .github/workflows/musl-zig.yml | 5 +++-- .github/workflows/ubuntu.yml | 31 ++++++++++++++++++------------- .github/workflows/windows.yml | 2 +- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8242d67..f776f04 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -79,9 +79,9 @@ jobs: # 7z压缩 - name: 7zip run: | - cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install macos - 7z a ${{ env.PKG_NAME }}.7z macos - rm -r -f macos + cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install ${{ env.PKG_NAME }} + 7z a ${{ env.PKG_NAME }}.7z ${{ env.PKG_NAME }} + rm -r -f ${{ env.PKG_NAME }} # 编译 - name: build java @@ -94,6 +94,7 @@ jobs: run: | cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install/share/OpenCV/java ${{ env.JAVA_PKG_NAME }} 7z a ${{ env.JAVA_PKG_NAME }}.7z ${{ env.JAVA_PKG_NAME }} + rm -r -f ${{ env.JAVA_PKG_NAME }} # 上传artifact # - name: upload diff --git a/.github/workflows/musl-gcc.yml b/.github/workflows/musl-gcc.yml index f075112..04cc18d 100644 --- a/.github/workflows/musl-gcc.yml +++ b/.github/workflows/musl-gcc.yml @@ -83,6 +83,7 @@ jobs: BUILD_SCRIPT: build-opencv3-musl-gcc.sh BUILD_OPTIONS: opencv3_cmake_options.txt PKG_NAME: opencv-${{ matrix.ver.cv }}-${{ matrix.arch }} + MUSL_NAME: ${{ matrix.arch }}-${{ matrix.ver.musl }} steps: # 检出代码 @@ -91,7 +92,7 @@ jobs: # 部署musl - name: deploy musl gcc run: | - wget https://github.com/benjaminwan/musl-cross-builder/releases/download/${{ matrix.ver.musl }}/${{ matrix.arch }}-${{ matrix.ver.musl }}.7z -O ${{ matrix.arch }}.7z + wget https://github.com/benjaminwan/musl-cross-builder/releases/download/${{ matrix.ver.musl }}/${{ env.MUSL_NAME }}.7z -O ${{ matrix.arch }}.7z 7z x ${{ matrix.arch }}.7z -aoa mv ${{ matrix.arch }}/ /opt/ echo "/opt/${{ matrix.arch }}" >> $GITHUB_PATH @@ -123,9 +124,9 @@ jobs: # 7z压缩 - name: 7zip run: | - cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install linux - 7z a ${{ env.PKG_NAME }}.7z linux - rm -r -f linux + cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install ${{ env.PKG_NAME }} + 7z a ${{ env.PKG_NAME }}.7z ${{ env.PKG_NAME }} + rm -r -f ${{ env.PKG_NAME }} # 上传artifact # - name: upload diff --git a/.github/workflows/musl-zig.yml b/.github/workflows/musl-zig.yml index 1247f92..398465b 100644 --- a/.github/workflows/musl-zig.yml +++ b/.github/workflows/musl-zig.yml @@ -106,8 +106,9 @@ jobs: # 7z压缩 - name: 7zip run: | - cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.target }}/install linux - 7z a ${{ env.PKG_NAME }}.7z linux + cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.target }}/install ${{ env.PKG_NAME }} + 7z a ${{ env.PKG_NAME }}.7z ${{ env.PKG_NAME }} + rm -r -f ${{ env.PKG_NAME }} # 上传artifact # - name: upload diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0ac56ce..bfbeb27 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -5,7 +5,7 @@ on: jobs: ubuntu: - runs-on: ubuntu-2204 + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -42,6 +42,10 @@ jobs: BUILD_OPTIONS: opencv3_cmake_options.txt PKG_NAME: opencv-${{ matrix.ver.cv }}-ubuntu-${{ matrix.list.os_ver }}-${{ matrix.arch }} JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-ubuntu-${{ matrix.list.os_ver }}-${{ matrix.arch }}-java + CMAKE_NAME: cmake-${{ matrix.ver.cmake }}-${{ matrix.os_name }}-${{ matrix.list.os_ver }}-${{ matrix.arch }} + PYTHON_NAME: python-${{ matrix.ver.python }}-${{ matrix.os_name }}-${{ matrix.list.os_ver }}-${{ matrix.arch }} + ANT_NAME: apache-ant-${{ matrix.ver.ant }}-bin + steps: # 检出代码 @@ -73,21 +77,21 @@ jobs: - name: deploy cmake run: | - wget https://github.com/benjaminwan/CmakeBuilder/releases/download/${{ matrix.ver.cmake }}/cmake-${{ matrix.ver.cmake }}-${{ matrix.os_name }}-${{ matrix.list.os_ver }}-${{ matrix.arch }}.7z -O cmake-${{ matrix.ver.cmake }}.7z - 7z x cmake-${{ matrix.ver.cmake }}.7z -aoa - rm cmake-${{ matrix.ver.cmake }}.7z + wget https://github.com/benjaminwan/CmakeBuilder/releases/download/${{ matrix.ver.cmake }}/${{ env.CMAKE_NAME }}.7z -O ${{ env.CMAKE_NAME }}.7z + 7z x ${{ env.CMAKE_NAME }}.7z -aoa + rm ${{ env.CMAKE_NAME }}.7z - name: deploy python run: | - wget https://github.com/benjaminwan/PythonBuilder/releases/download/${{ matrix.ver.python }}/python-${{ matrix.ver.python }}-${{ matrix.os_name }}-${{ matrix.list.os_ver }}-${{ matrix.arch }}.7z -O python-${{ matrix.ver.python }}.7z - 7z x python-${{ matrix.ver.python }}.7z -aoa - rm python-${{ matrix.ver.python }}.7z + wget https://github.com/benjaminwan/PythonBuilder/releases/download/${{ matrix.ver.python }}/${{ env.PYTHON_NAME }}.7z -O ${{ env.PYTHON_NAME }}.7z + 7z x ${{ env.PYTHON_NAME }}.7z -aoa + rm ${{ env.PYTHON_NAME }}.7z - name: deploy ant run: | - wget https://dlcdn.apache.org/ant/binaries/apache-ant-${{ matrix.ver.ant }}-bin.tar.gz -O apache-ant-${{ matrix.ver.ant }}.tar.gz - tar -xf apache-ant-${{ matrix.ver.ant }}.tar.gz - rm apache-ant-${{ matrix.ver.ant }}.tar.gz + wget https://dlcdn.apache.org/ant/binaries/${{ env.ANT_NAME }}.tar.gz -O ${{ env.ANT_NAME }}.tar.gz + tar -xf ${{ env.ANT_NAME }}.tar.gz + rm ${{ env.ANT_NAME }}.tar.gz - name: Host - Create Docker template env file run: | @@ -124,9 +128,9 @@ jobs: # install文件夹改名linux，并使用7z压缩 - name: 7zip run: | - cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install linux - 7z a ${{ env.PKG_NAME }}.7z linux - rm -r -f linux + cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install ${{ env.PKG_NAME }} + 7z a ${{ env.PKG_NAME }}.7z ${{ env.PKG_NAME }} + rm -r -f ${{ env.PKG_NAME }} - name: Docker - build run: | @@ -137,6 +141,7 @@ jobs: run: | cp -r opencv-${{ matrix.ver.cv }}/build-Release-${{ matrix.arch }}/install/share/OpenCV/java ${{ env.JAVA_PKG_NAME }} 7z a ${{ env.JAVA_PKG_NAME }}.7z ${{ env.JAVA_PKG_NAME }} + rm -r -f ${{ env.JAVA_PKG_NAME }} # 上传artifact # - name: upload diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6f62a40..2207135 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -41,7 +41,7 @@ jobs: BUILD_SCRIPT: build-opencv3-win.ps1 BUILD_OPTIONS: opencv3_cmake_options.txt PKG_NAME: opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-${{ matrix.arch }}-${{ matrix.crt }} - JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-java-${{ matrix.arch }}-${{ matrix.crt }} + JAVA_PKG_NAME: opencv-${{ matrix.ver.cv }}-windows-${{ matrix.list.vs_name }}-${{ matrix.arch }}-${{ matrix.crt }}-java steps: # Setup JDK