solve conflict, add branchto ci

TheLartians · Apr 5, 2022 · b1547f2 · b1547f2
1 parent 747ef4b
commit b1547f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - master
+      - add-docker-build
   pull_request:
     branches:
       - main

diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14...3.22 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.14...3.22)
 
 project(
   GreeterStandalone