Skip to content

Commit

Permalink
Merge branch 'dev' to release v0.11.0
Browse files Browse the repository at this point in the history
feat&build: each problem will own it's folder and update dependencies
  • Loading branch information
Certseeds committed May 27, 2023
2 parents 5079548 + 051666f commit d7e0a56
Show file tree
Hide file tree
Showing 224 changed files with 805 additions and 459 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04, ubuntu-latest ]
gcc_v: [ 11 ] # Version of G++,GCC
env:
GCC_V: ${{ matrix.gcc_v }}
CC: gcc-10
CXX: g++-10
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

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

- name: Install GCC-11,G++-11, ccache
- name: Install ccache, check gcc version
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V} ccache
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
sudo apt-get update && sudo apt-get install -y ccache
gcc --version
g++ --version
- name: prepare libopencv
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
strategy:
matrix:
os: [ ubuntu-20.04, ubuntu-latest ]
gcc_v: [ 11 ] # Version of G++,GCC
env:
GCC_V: ${{ matrix.gcc_v }}
CC: gcc-10
CXX: g++-10
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

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

- name: Install GCC-11,G++-11, ccache
- name: Install ccache, check gcc version
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V} ccache
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
sudo apt-get update && sudo apt-get install -y ccache
gcc --version
g++ --version
- name: prepare libopencv
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-20.04, ubuntu-latest]
gcc_v: [ 11 ] # Version of G++,GCC
os: [ ubuntu-20.04, ubuntu-latest ]
env:
GCC_V: ${{ matrix.gcc_v }}
CC: gcc-10
CXX: g++-10
# Steps represent a sequence of tasks that will be executed as part of the job
steps:

Expand All @@ -30,12 +30,12 @@ jobs:
- name: hardwares - cpu
run: nproc; cat /proc/cpuinfo

- name: Install GCC-11,G++-11
- name: Install ccache, check gcc version
run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update && sudo apt-get install -y gcc-${GCC_V} g++-${GCC_V}
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 111
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} 111
sudo apt-get update && sudo apt-get install -y ccache
gcc --version
g++ --version
- name: prepare libopencv ccache
run: |
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,6 @@ __pycache__/

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
Expand Down
202 changes: 0 additions & 202 deletions .vscode/settings.json

This file was deleted.

8 changes: 6 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.16.6)

set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 10)
set(PROJECT_VERSION_MINOR 11)
set(PROJECT_VERSION_PATCH 0) # delete endsWith strs when master merge dev

project(CS203_DSAA_template
Expand All @@ -26,6 +26,10 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party)
enable_testing()
file(GLOB USER_LIBS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lab_*) # regex to find libs, more flexibility
foreach (elementName IN LISTS USER_LIBS_PATH)
add_subdirectory(${elementName})
if (EXISTS ${elementName}/CMakeLists.txt)
add_subdirectory(${elementName})
else()
MESSAGE("${elementName} is empty")
endif ()
endforeach ()
unset(USER_LIBS_PATH)
Loading

0 comments on commit d7e0a56

Please sign in to comment.