Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump 4.9.0 #9

Merged
merged 4 commits into from
Mar 27, 2024
Merged

Bump 4.9.0 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b94c39
Bump 4.9.0
umireon Mar 27, 2024
ba78384
Update build.yml
umireon Mar 27, 2024
ce6454f
Update build.yml
umireon Mar 27, 2024
857c878
Fix
umireon Mar 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ on:
branches:
- "main"

concurrency:
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: "${{ github.ref != 'refs/heads/main' }}"

env:
OPENCV_VERSION: "4.9.0"

jobs:
BuildMac:
runs-on: "macos-13"
Expand All @@ -34,14 +41,21 @@ 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-macos.sh"
run: "./build-macos.sh ${{ matrix.config }} ${{ steps.get-version.outputs.version }}"

- uses: "actions/upload-artifact@v3"
- name: "Upload artifact"
uses: "actions/upload-artifact@v4"
with:
name: "opencv-macos-${{ matrix.config }}"
path: "release/*.tar.gz"
Expand Down Expand Up @@ -69,14 +83,20 @@ 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 }}"

- uses: "actions/upload-artifact@v3"
- uses: "actions/upload-artifact@v4"
with:
name: "opencv-linux-${{ matrix.config }}"
path: "release/*.tar.gz"
Expand All @@ -101,14 +121,20 @@ 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 }}"

- uses: "actions/upload-artifact@v3"
- uses: "actions/upload-artifact@v4"
with:
name: "opencv-windows-${{ matrix.config }}"
path: "release/*.zip"
Expand Down Expand Up @@ -141,7 +167,7 @@ jobs:
id: "get-version"

- name: "Download build artifacts"
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"

- name: "Create Release"
uses: "softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5"
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Build-Windows.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ cmake opencv -B build_$Configuration `
-DBUILD_opencv_features2d=ON `
-DBUILD_opencv_flann=OFF `
-DBUILD_opencv_gapi=OFF `
-DBUILD_opencv_highgui=OFF `
-DBUILD_opencv_imgcodecs=OFF `
-DBUILD_opencv_highgui=ON `
-DBUILD_opencv_imgcodecs=ON `
-DBUILD_opencv_imgproc=ON `
-DBUILD_opencv_ml=OFF `
-DBUILD_opencv_objdetect=OFF `
-DBUILD_opencv_photo=ON `
-DBUILD_opencv_stitching=OFF `
-DBUILD_opencv_video=OFF `
-DBUILD_opencv_videoio=OFF `
-DBUILD_opencv_video=ON `
-DBUILD_opencv_videoio=ON `
-DWITH_PNG=OFF `
-DWITH_JPEG=OFF `
-DWITH_TIFF=OFF `
Expand Down
8 changes: 4 additions & 4 deletions build-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ cmake opencv "$OPENCV_DIR" -B build_$1 \
-DBUILD_opencv_features2d=ON \
-DBUILD_opencv_flann=OFF \
-DBUILD_opencv_gapi=OFF \
-DBUILD_opencv_highgui=OFF \
-DBUILD_opencv_imgcodecs=OFF \
-DBUILD_opencv_highgui=ON \
-DBUILD_opencv_imgcodecs=ON \
-DBUILD_opencv_imgproc=ON \
-DBUILD_opencv_ml=OFF \
-DBUILD_opencv_objdetect=OFF \
-DBUILD_opencv_photo=ON \
-DBUILD_opencv_stitching=OFF \
-DBUILD_opencv_video=OFF \
-DBUILD_opencv_videoio=OFF \
-DBUILD_opencv_video=ON \
-DBUILD_opencv_videoio=ON \
-DWITH_PNG=OFF \
-DWITH_JPEG=OFF \
-DWITH_TIFF=OFF \
Expand Down
8 changes: 4 additions & 4 deletions build-macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ cmake opencv -B build_$1 \
-DBUILD_opencv_features2d=ON \
-DBUILD_opencv_flann=OFF \
-DBUILD_opencv_gapi=OFF \
-DBUILD_opencv_highgui=OFF \
-DBUILD_opencv_imgcodecs=OFF \
-DBUILD_opencv_highgui=ON \
-DBUILD_opencv_imgcodecs=ON \
-DBUILD_opencv_imgproc=ON \
-DBUILD_opencv_ml=OFF \
-DBUILD_opencv_objdetect=OFF \
-DBUILD_opencv_photo=ON \
-DBUILD_opencv_stitching=OFF \
-DBUILD_opencv_video=OFF \
-DBUILD_opencv_videoio=OFF \
-DBUILD_opencv_video=ON \
-DBUILD_opencv_videoio=ON \
-DWITH_PNG=OFF \
-DWITH_JPEG=OFF \
-DWITH_TIFF=OFF \
Expand Down
1 change: 0 additions & 1 deletion opencv
Open in desktop
Submodule opencv deleted from dad8af