From e794d8721f473059a6dceb35a42d4c6526bf3885 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 18:48:38 -0800 Subject: [PATCH 01/15] Create ccpp.yml --- .github/workflows/ccpp.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/ccpp.yml diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml new file mode 100644 index 000000000..5097684d4 --- /dev/null +++ b/.github/workflows/ccpp.yml @@ -0,0 +1,26 @@ +name: C/C++ CI + +on: [push] + +jobs: + linux: + name: Linux + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Cmake + run: | + [ "$(git rev-parse --abbrev-ref HEAD)" == "master" ] && \ + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=on . || \ + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . + + - name: Make + run: make + + - name: Run Examples + run: ./MxRead && ./MxWrite + + - name: Run Tests + run: ./MxTest From 2f18351578da68d6315d2684876e7012ab0688d8 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 18:55:23 -0800 Subject: [PATCH 02/15] add core count --- .github/workflows/ccpp.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5097684d4..0ad27ada0 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -15,9 +15,13 @@ jobs: [ "$(git rev-parse --abbrev-ref HEAD)" == "master" ] && \ cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=on . || \ cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - - - name: Make - run: make + - name: Check Cores + run: | + export CORE_COUNT=$(nproc --all) && echo "CORE_COUNT: $CORE_COUNT" && \ + lscpu + + - name: Build + run: make -j "$CORE_COUNT" - name: Run Examples run: ./MxRead && ./MxWrite From 3bcb94feed87dac0a52cb13b8d01a1aa5e7edcd1 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 18:58:07 -0800 Subject: [PATCH 03/15] fix j argument --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0ad27ada0..26c2a356f 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -21,7 +21,7 @@ jobs: lscpu - name: Build - run: make -j "$CORE_COUNT" + run: export CORE_COUNT=$(nproc --all) && make -j$CORE_COUNT - name: Run Examples run: ./MxRead && ./MxWrite From 4b34e4b860b011a3090bdf9f8f5e987c6becab44 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 19:47:08 -0800 Subject: [PATCH 04/15] add windows attempt 1 --- .github/workflows/ccpp.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 26c2a356f..47bbed39c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -19,7 +19,7 @@ jobs: run: | export CORE_COUNT=$(nproc --all) && echo "CORE_COUNT: $CORE_COUNT" && \ lscpu - + - name: Build run: export CORE_COUNT=$(nproc --all) && make -j$CORE_COUNT @@ -28,3 +28,29 @@ jobs: - name: Run Tests run: ./MxTest + + windows: + name: Windows + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + + - name: Cmake + run: | + cmake -DMX_BUILD_EXAMPLES=on \ + -DMX_BUILD_TESTS=on \ + -DMX_BUILD_CORE_TESTS=off \ + . + + - name: Build + run: make + + - name: Run Example MxWrite + run: MxWrite.exe + + - name: Run Example MxRead + run: MxRead.exe + + - name: Run Tests + run: MxTest.exe From 724197caed22944de063036cae2291aadcf230ff Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 19:50:13 -0800 Subject: [PATCH 05/15] windows 2 --- .github/workflows/ccpp.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 47bbed39c..9306460ac 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,10 +38,7 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on \ - -DMX_BUILD_TESTS=on \ - -DMX_BUILD_CORE_TESTS=off \ - . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - name: Build run: make From 8d74a29149cbd2a8a4545dfef4b72003976639a0 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 19:59:07 -0800 Subject: [PATCH 06/15] windows 3 --- .github/workflows/ccpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9306460ac..9c694fa57 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,10 +38,10 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off -G "Visual Studio 12" . - name: Build - run: make + run: MSBuild ALL_BUILD.vcxproj - name: Run Example MxWrite run: MxWrite.exe From 21ea94c20b71a203101c9a5c527564152cfb0b22 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:00:33 -0800 Subject: [PATCH 07/15] windows 4 --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9c694fa57..7aecfee9e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,7 +38,7 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off -G "Visual Studio 12" . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - name: Build run: MSBuild ALL_BUILD.vcxproj From b24fd486fbeba04f24e1d838882bb59185e677fc Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:02:32 -0800 Subject: [PATCH 08/15] windows 5 --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7aecfee9e..0cc7abceb 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -41,7 +41,7 @@ jobs: cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - name: Build - run: MSBuild ALL_BUILD.vcxproj + run: MSBuild.exe ALL_BUILD.vcxproj - name: Run Example MxWrite run: MxWrite.exe From 90c83fd7bcbdf46ac4f8473c2e28cb4af8d7a104 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:05:23 -0800 Subject: [PATCH 09/15] Update ccpp.yml --- .github/workflows/ccpp.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 0cc7abceb..198aafae8 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,10 +38,7 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - - - name: Build - run: MSBuild.exe ALL_BUILD.vcxproj + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off --build . - name: Run Example MxWrite run: MxWrite.exe From 4ca4c65aba8c2ca6211c6bec31fbd3e00e9aa746 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:07:51 -0800 Subject: [PATCH 10/15] windows 7 --- .github/workflows/ccpp.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 198aafae8..e5c4234e8 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -40,6 +40,10 @@ jobs: run: | cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off --build . + - name: Build + run: | + cmake --build . + - name: Run Example MxWrite run: MxWrite.exe From 04960abf03e1b7c4a16063477223a4f944e80367 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:11:13 -0800 Subject: [PATCH 11/15] macos 1 --- .github/workflows/ccpp.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index e5c4234e8..85a063db2 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -52,3 +52,27 @@ jobs: - name: Run Tests run: MxTest.exe + + macos: + name: macOS + runs-on: macos-latest + + steps: + - uses: actions/checkout@v2 + + - name: Cmake + run: | + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off --build . + + - name: Build + run: | + cmake --build . + + - name: Run Example MxWrite + run: ./MxWrite + + - name: Run Example MxRead + run: ./MxRead + + - name: Run Tests + run: ./MxTest From a325b44f98018173205dd1412393796d73b273bb Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 20:30:07 -0800 Subject: [PATCH 12/15] windows 8 --- .github/workflows/ccpp.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 85a063db2..7ae721840 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,20 +38,26 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off --build . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off -DEXECUTABLE_OUTPUT_PATH=outdir . - name: Build run: | cmake --build . + + - name: List Directory + run: dir + - name: List Outdir + run: cd outdir && dir + - name: Run Example MxWrite - run: MxWrite.exe + run: cd outdir && MxWrite.exe - name: Run Example MxRead - run: MxRead.exe + run: cd outdir && MxRead.exe - name: Run Tests - run: MxTest.exe + run: cd outdir && MxTest.exe macos: name: macOS @@ -62,7 +68,7 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off --build . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - name: Build run: | From 33f6c42dbbdd21385e3f1c2a3cac842edbcf6407 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 21:06:25 -0800 Subject: [PATCH 13/15] Windows 9 i think --- .github/workflows/ccpp.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7ae721840..121d8f1e8 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -38,7 +38,7 @@ jobs: - name: Cmake run: | - cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off -DEXECUTABLE_OUTPUT_PATH=outdir . + cmake -DMX_BUILD_EXAMPLES=on -DMX_BUILD_TESTS=on -DMX_BUILD_CORE_TESTS=off . - name: Build run: | @@ -47,8 +47,8 @@ jobs: - name: List Directory run: dir - - name: List Outdir - run: cd outdir && dir + - name: List x64 Dir + run: cd x64 && dir - name: Run Example MxWrite run: cd outdir && MxWrite.exe From 4e49c3ff47ba3e480f789d618ed7adbedf431aa3 Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 21:31:45 -0800 Subject: [PATCH 14/15] Win --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 121d8f1e8..5288715c0 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -48,7 +48,7 @@ jobs: run: dir - name: List x64 Dir - run: cd x64 && dir + run: cd x64 -and dir - name: Run Example MxWrite run: cd outdir && MxWrite.exe From aa15cffd43cd2ffa55ec2124d443231d11c20adf Mon Sep 17 00:00:00 2001 From: Matthew James Briggs <6260372+webern@users.noreply.github.com> Date: Sat, 29 Feb 2020 21:59:04 -0800 Subject: [PATCH 15/15] Win --- .github/workflows/ccpp.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 5288715c0..bc19e2841 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -47,17 +47,17 @@ jobs: - name: List Directory run: dir - - name: List x64 Dir - run: cd x64 -and dir + #- name: List Debug Dir + # run: cd x64 -and dir - name: Run Example MxWrite - run: cd outdir && MxWrite.exe + run: Debug\MxWrite.exe - name: Run Example MxRead - run: cd outdir && MxRead.exe + run: Debug\MxRead.exe - name: Run Tests - run: cd outdir && MxTest.exe + run: Debug\MxTest.exe macos: name: macOS