Merge pull request #1 from 0xz/pr

run action in PR
0xz · Jan 21, 2024 · 1bc922a · 1bc922a
2 parents 3978808 + 24bf334
commit 1bc922a
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 121 deletions.
diff --git a/.github/workflows/build_nix.yml b/.github/workflows/build_nix.yml
@@ -0,0 +1,17 @@
+name: ubuntu-latest
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - run: |
+        sudo apt update && sudo apt install ninja-build ccache
+        chmod +x sh/run.sh && ./sh/run.sh
diff --git a/sh/clean.sh b/sh/clean.sh
@@ -3,7 +3,7 @@ set -e
 CWD="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" && cd $CWD/.. && CWD=$PWD # move to project root
 
 DIRS=(build CMakeFiles)
-for D in ${DIRS[@]}; do find tut -type d -name $D | xargs rm -rf; done
+for D in ${DIRS[@]}; do find tut* -type d -name $D | xargs rm -rf; done
 
 FILES=(CMakeCache.txt)
-for F in ${FILES[@]}; do find tut -type f -name $F | xargs rm -rf; done
+for F in ${FILES[@]}; do find tut* -type f -name $F | xargs rm -rf; done
diff --git a/tut/001/CMakeLists.txt b/tut/001/CMakeLists.txt
@@ -1,6 +1,6 @@
+cmake_minimum_required (VERSION 3.18)
 
 project(hello_world)
-cmake_minimum_required (VERSION 3.18)
 
 add_executable(${PROJECT_NAME} main.cpp)
 enable_testing()

diff --git a/tut/002/CMakeLists.txt b/tut/002/CMakeLists.txt
@@ -1,6 +1,6 @@
+cmake_minimum_required (VERSION 3.18)
 
 project(hello_library)
-cmake_minimum_required (VERSION 3.18)
 
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/tut/003/CMakeLists.txt b/tut/003/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/tut/004/CMakeLists.txt b/tut/004/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 set(CMAKE_BUILD_TYPE "Debug")
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tut/005/CMakeLists.txt b/tut/005/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 set(CMAKE_BUILD_TYPE "Release")
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tut/006/CMakeLists.txt b/tut/006/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 set(CMAKE_BUILD_TYPE "Release")
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tut/007/CMakeLists.txt b/tut/007/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 set(CMAKE_BUILD_TYPE "Release")
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tut/008/CMakeLists.txt b/tut/008/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(hello_library)
 cmake_minimum_required (VERSION 3.18)
+project(hello_library)
 
 option(BUILD_RELEASE "Build for release" OFF)
 

diff --git a/tut/009/CMakeLists.txt b/tut/009/CMakeLists.txt
@@ -1,5 +1,5 @@
-project(fetch_tpp)
 cmake_minimum_required (VERSION 3.18)
+project(fetch_tpp)
 
 set(CMAKE_BUILD_TYPE "Debug")
 set(PROJECT_DIR ${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/tut_adv/002/.run.sh.err b/tut_adv/002/.run.sh.err
diff --git a/tut_adv/002/.run.sh.out b/tut_adv/002/.run.sh.out
diff --git a/tut_adv/002/main.cpp b/tut_adv/002/main.cpp
@@ -9,10 +9,6 @@
 
 std::size_t static constexpr N_DOUBLES = 1e8;
 
-double memory_consumption(){
-    return N_DOUBLES * 3 * sizeof(double) / 1e9;
-}
-
 auto now_in_milliseconds(){
     return std::chrono::high_resolution_clock::now();
 }