Skip to content

Commit b784e68

Browse files
committed
Merge branch 'dev' to release version v0.9.1
Signed-off-by: Certseeds <51754303+Certseeds@users.noreply.github.com>
2 parents 109e6ad + 27d3ba3 commit b784e68

4 files changed

Lines changed: 19 additions & 13 deletions

File tree

.github/workflows/release.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,12 @@ jobs:
8282
needs: test
8383
# The type of runner that the job will run on
8484
runs-on: ubuntu-latest
85-
8685
# Steps represent a sequence of tasks that will be executed as part of the job
8786
steps:
8887

8988
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
9089
- name: checkout code
91-
uses: actions/checkout@v3
90+
uses: actions/checkout@v3
9291

9392
- name: Branch name
9493
id: branch_name
@@ -104,9 +103,21 @@ jobs:
104103
SOURCE_BRANCH: ${{ steps.branch_name.outputs.SOURCE_BRANCH }}
105104
SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
106105

106+
- name: prepare libopencv
107+
run: |
108+
sudo apt-get update && sudo apt-get install libopencv-dev
107109
# ensure the path and files of project
108110
- name: ensure the path and files of project
109-
run: sudo apt-get install tree; tree
111+
run: sudo apt-get install tree; tree; mkdir -p ./cmake_build_release
112+
113+
- name: cmake install dependencies
114+
run: cmake -S . -B ./cmake_build_release -DCMAKE_BUILD_TYPE=Debug
115+
116+
- name: move cmake-fetchcontent to folder
117+
working-directory: ./third_party
118+
run: |
119+
rm ./CMakeLists.txt
120+
mv ./CMakeLists.release.txt ./CMakeLists.txt
110121
111122
- name: run script
112123
working-directory: ./script
@@ -159,21 +170,14 @@ jobs:
159170
git config --global user.name 'Certseeds'
160171
git config --global user.email '51754303+Certseeds@users.noreply.github.com'
161172
git checkout -b release
162-
mkdir cmake_build_relase
163-
164-
- name: Install GCC-11,G++-11, ccache
165-
run: |
166-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
167-
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V} ccache
168-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
169-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
173+
mkdir cmake_build_release
170174
171175
- name: prepare libopencv
172176
run: |
173177
sudo apt-get update && sudo apt-get install libopencv-dev
174178
175179
- name: cmake install dependencies
176-
run: cmake -S . -B ./cmake_build_relase -DCMAKE_BUILD_TYPE=Debug
180+
run: cmake -S . -B ./cmake_build_release -DCMAKE_BUILD_TYPE=Debug
177181

178182
- name: move cmake-fetchcontent to folder
179183
working-directory: ./third_party

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16.6)
22

33
set(PROJECT_VERSION_MAJOR 0)
44
set(PROJECT_VERSION_MINOR 9)
5-
set(PROJECT_VERSION_PATCH 0) # delete endsWith strs when master merge dev
5+
set(PROJECT_VERSION_PATCH 1) # delete endsWith strs when master merge dev
66

77
project(CS203_DSAA_template
88
DESCRIPTION "Template for Algorithm Based on C++11 and Modern CMake"

third_party/CMakeLists.release.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ cmake_minimum_required(VERSION 3.16.6)
22
project(CS203_CATCH2_LIB)
33
set(CMAKE_CXX_STANDARD 17)
44
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
5+
set("BUILD_${LIB_WAY}_LIBS" YES)
56

67
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/catch2)

third_party/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.16.6)
22
project(CS203_CATCH2_LIB)
33
set(CMAKE_CXX_STANDARD 17)
44
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
5+
set("BUILD_${LIB_WAY}_LIBS" YES)
56

67
Include(FetchContent)
78
set(CATCH2_URL https://github.com/catchorg/Catch2/archive/refs/tags/v3.3.1.tar.gz)

0 commit comments

Comments
 (0)