less quotes for workflow files; declare vars in makefiles
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 65c1e95..5a3d736 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@
- name: "Linux / OpenSSL 1.1.1"
command: make -f misc/docker-ci.mk
- name: "Linux / OpenSSL 1.1.1 + ASan & UBSan"
- command: make -f misc/docker-ci.mk CMAKE_ARGS='"-DCMAKE_C_COMPILER=clang;-fsanitize=address,undefined" "-DCMAKE_CXX_COMPILER=clang++;-fsanitize=address,undefined"' CHECK_ENVS="ASAN_OPTIONS=detect_leaks=0 UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1"
+ command: make -f misc/docker-ci.mk CMAKE_ARGS='-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_FLAGS=-fsanitize=address,undefined -DCMAKE_CXX_FLAGS=-fsanitize=address,undefined' CHECK_ENVS='ASAN_OPTIONS=detect_leaks=0 UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1'
timeout-minutes: 10
steps:
diff --git a/misc/docker-ci.mk b/misc/docker-ci.mk
index 9c543f0..4eb042a 100644
--- a/misc/docker-ci.mk
+++ b/misc/docker-ci.mk
@@ -2,6 +2,7 @@
SRC_DIR=/picotls
CI_MK=$(SRC_DIR)/misc/docker-ci.mk
CMAKE_ARGS=
+CHECK_ENVS=
DOCKER_RUN_OPTS=--privileged \
-v `pwd`:$(SRC_DIR) \
-it
@@ -19,5 +20,5 @@
_do-check:
cmake $(CMAKE_ARGS) "-H$(SRC_DIR)" -B.
- make all VERBOSE=1
- env $(CHECK_ENVS) make check
+ $(MAKE) all VERBOSE=1
+ env $(CHECK_ENVS) $(MAKE) check
