From 3b94c39133e5dcfd4cdbe0376a3dc8bd8046604c Mon Sep 17 00:00:00 2001 From: Kaito Udagawa Date: Thu, 28 Mar 2024 01:43:14 +0900 Subject: [PATCH] Bump 4.9.0 --- .github/workflows/build.yml | 36 +++++++++++++++++++++++++++--------- .gitmodules | 3 --- opencv | 1 - 3 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 .gitmodules delete mode 160000 opencv diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b937f4a..1f72cc5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,9 @@ on: branches: - "main" +env: + OPENCV_VERSION: "4.9.0" + jobs: BuildMac: runs-on: "macos-13" @@ -34,12 +37,15 @@ jobs: printf "version=%s" "$version" > "$GITHUB_OUTPUT" id: "get-version" - - uses: "actions/checkout@v4" - with: - submodules: "recursive" + - name: "Checkout" + uses: "actions/checkout@v4" - - name: "Run build-macos.sh" - run: "./build-macos.sh ${{ matrix.config }} ${{ steps.get-version.outputs.version }}" + - name: "Checkout OpenCV" + uses: "actions/checkout@v4" + with: + repository: "opencv/opencv" + ref: "${{ env.OPENCV_VERSION }}" + path: "opencv" - uses: "actions/upload-artifact@v3" with: @@ -69,9 +75,15 @@ jobs: printf "version=%s" "$version" > "$GITHUB_OUTPUT" id: "get-version" - - uses: "actions/checkout@v4" + - name: "Checkout" + uses: "actions/checkout@v4" + + - name: "Checkout OpenCV" + uses: "actions/checkout@v4" with: - submodules: "recursive" + repository: "opencv/opencv" + ref: "${{ env.OPENCV_VERSION }}" + path: "opencv" - name: "Run build-linux.sh" run: "./build-linux.sh ${{ matrix.config }} ${{ steps.get-version.outputs.version }}" @@ -101,9 +113,15 @@ jobs: printf "version=%s" "$version" > "$GITHUB_OUTPUT" id: "get-version" - - uses: "actions/checkout@v4" + - name: "Checkout" + uses: "actions/checkout@v4" + + - name: "Checkout OpenCV" + uses: "actions/checkout@v4" with: - submodules: "recursive" + repository: "opencv/opencv" + ref: "${{ env.OPENCV_VERSION }}" + path: "opencv" - name: "Run Build-Windows.ps1" run: "./Build-Windows.ps1 -Configuration ${{ matrix.config }} -Version ${{ steps.get-version.outputs.version }}" diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index ae6c2ac..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "opencv"] - path = opencv - url = https://github.com/opencv/opencv.git diff --git a/opencv b/opencv deleted file mode 160000 index dad8af6..0000000 --- a/opencv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dad8af6b17f8e60d7b95a1203a1b4d22f56574cf