Skip to content

Commit 9f49b02

Browse files
committed
Requiring commsdsl v6.3.4
1 parent 5210d44 commit 9f49b02

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.github/workflows/actions_build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Github Actions Build
33
on: [push]
44

55
env:
6-
COMMS_TAG: v5.2.5
7-
COMMSDSL_TAG: v6.3.3
8-
CC_TOOLS_QT_TAG: v5.3.1
6+
COMMS_TAG: develop
7+
COMMSDSL_TAG: develop
8+
CC_TOOLS_QT_TAG: develop
99

1010
jobs:
1111
build_gcc_old_ubuntu_20_04:

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ option (MQTTSN_BUILD_EMSCRIPTEN "Build and install project generated by the comm
3333
# COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
3434

3535
set (MQTTSN_VERSION "2.8.2")
36-
set (MQTTSN_MIN_COMMSDSL_VERSION "6.3.3")
36+
set (MQTTSN_MIN_COMMSDSL_VERSION "6.3.4")
3737

3838
set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
3939

script/full_debug_build_clang.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
#!/bin/bash
22

3-
export CC=clang
4-
export CXX=clang++
3+
if [ -z "${CC}" ]; then
4+
export CC=clang
5+
fi
6+
7+
if [ -z "${CXX}" ]; then
8+
export CXX=clang++
9+
fi
10+
511

612
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
713
${SCRIPT_DIR}/full_debug_build.sh "$@"

script/full_debug_build_gcc.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
22

3-
export CC=gcc
4-
export CXX=g++
3+
if [ -z "${CC}" ]; then
4+
export CC=gcc
5+
fi
6+
7+
if [ -z "${CXX}" ]; then
8+
export CXX=g++
9+
fi
510

611
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
712
${SCRIPT_DIR}/full_debug_build.sh "$@"

0 commit comments

Comments
 (0)