Skip to content

Commit d7e0a56

Browse files
authored
Merge branch 'dev' to release v0.11.0
feat&build: each problem will own it's folder and update dependencies
2 parents 5079548 + 051666f commit d7e0a56

224 files changed

Lines changed: 805 additions & 459 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/daily.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [ ubuntu-20.04, ubuntu-latest ]
18-
gcc_v: [ 11 ] # Version of G++,GCC
1918
env:
20-
GCC_V: ${{ matrix.gcc_v }}
19+
CC: gcc-10
20+
CXX: g++-10
2121
# Steps represent a sequence of tasks that will be executed as part of the job
2222
steps:
2323

@@ -40,12 +40,12 @@ jobs:
4040
- name: ensure the path and files of project
4141
run: sudo apt-get install tree; tree
4242

43-
- name: Install GCC-11,G++-11, ccache
43+
- name: Install ccache, check gcc version
4444
run: |
4545
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
46-
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V} ccache
47-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
48-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
46+
sudo apt-get update && sudo apt-get install -y ccache
47+
gcc --version
48+
g++ --version
4949
5050
- name: prepare libopencv
5151
run: |

.github/workflows/pull_request.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
strategy:
1717
matrix:
1818
os: [ ubuntu-20.04, ubuntu-latest ]
19-
gcc_v: [ 11 ] # Version of G++,GCC
2019
env:
21-
GCC_V: ${{ matrix.gcc_v }}
20+
CC: gcc-10
21+
CXX: g++-10
2222
# Steps represent a sequence of tasks that will be executed as part of the job
2323
steps:
2424

@@ -42,12 +42,12 @@ jobs:
4242
- name: ensure the path and files of project
4343
run: sudo apt-get install tree; tree
4444

45-
- name: Install GCC-11,G++-11, ccache
45+
- name: Install ccache, check gcc version
4646
run: |
4747
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
48-
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V} ccache
49-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
50-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
48+
sudo apt-get update && sudo apt-get install -y ccache
49+
gcc --version
50+
g++ --version
5151
5252
- name: prepare libopencv
5353
run: |

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
os: [ ubuntu-20.04, ubuntu-latest]
20-
gcc_v: [ 11 ] # Version of G++,GCC
19+
os: [ ubuntu-20.04, ubuntu-latest ]
2120
env:
22-
GCC_V: ${{ matrix.gcc_v }}
21+
CC: gcc-10
22+
CXX: g++-10
2323
# Steps represent a sequence of tasks that will be executed as part of the job
2424
steps:
2525

@@ -30,12 +30,12 @@ jobs:
3030
- name: hardwares - cpu
3131
run: nproc; cat /proc/cpuinfo
3232

33-
- name: Install GCC-11,G++-11
33+
- name: Install ccache, check gcc version
3434
run: |
3535
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
36-
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V}
37-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
38-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
36+
sudo apt-get update && sudo apt-get install -y ccache
37+
gcc --version
38+
g++ --version
3939
4040
- name: prepare libopencv ccache
4141
run: |

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ __pycache__/
273273

274274
### VisualStudioCode ###
275275
.vscode/*
276-
!.vscode/settings.json
277276
!.vscode/tasks.json
278277
!.vscode/launch.json
279278
!.vscode/extensions.json

.vscode/settings.json

Lines changed: 0 additions & 202 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.16.6)
22

33
set(PROJECT_VERSION_MAJOR 0)
4-
set(PROJECT_VERSION_MINOR 10)
4+
set(PROJECT_VERSION_MINOR 11)
55
set(PROJECT_VERSION_PATCH 0) # delete endsWith strs when master merge dev
66

77
project(CS203_DSAA_template
@@ -26,6 +26,10 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party)
2626
enable_testing()
2727
file(GLOB USER_LIBS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lab_*) # regex to find libs, more flexibility
2828
foreach (elementName IN LISTS USER_LIBS_PATH)
29-
add_subdirectory(${elementName})
29+
if (EXISTS ${elementName}/CMakeLists.txt)
30+
add_subdirectory(${elementName})
31+
else()
32+
MESSAGE("${elementName} is empty")
33+
endif ()
3034
endforeach ()
3135
unset(USER_LIBS_PATH)

0 commit comments

Comments
 (0)