From 801a3321e1ad86833de3c695af6133c5e2d55097 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 14 Apr 2023 17:10:56 +0900 Subject: [PATCH 01/22] Test SimpleFederatedAuthenticatd CI test --- .../C/src/federated/{failing => }/SimpleFederatedAuthenticated.lf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/C/src/federated/{failing => }/SimpleFederatedAuthenticated.lf (100%) diff --git a/test/C/src/federated/failing/SimpleFederatedAuthenticated.lf b/test/C/src/federated/SimpleFederatedAuthenticated.lf similarity index 100% rename from test/C/src/federated/failing/SimpleFederatedAuthenticated.lf rename to test/C/src/federated/SimpleFederatedAuthenticated.lf From aede8750e5ffa1f767df6cc4e90e9c59bf6289e5 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 15 Apr 2023 16:19:27 +0900 Subject: [PATCH 02/22] Add option to add FEDERATED_AUTHENTICATED --- .../src/org/lflang/federated/extensions/CExtensionUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java index 124ffefb4f..a0b391c4b7 100644 --- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java +++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java @@ -244,6 +244,10 @@ public static void handleCompileDefinitions( federate.targetConfig.setByUser.add(TargetProperty.COMPILE_DEFINITIONS); federate.targetConfig.compileDefinitions.put("FEDERATED", ""); federate.targetConfig.compileDefinitions.put("FEDERATED_"+federate.targetConfig.coordination.toString().toUpperCase(), ""); + if (federate.targetConfig.auth) { + System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); + federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", ""); + } federate.targetConfig.compileDefinitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates)); federate.targetConfig.compileDefinitions.put("EXECUTABLE_PREAMBLE", ""); federate.targetConfig.compileDefinitions.put("WORKERS_NEEDED_FOR_FEDERATE", String.valueOf(minThreadsToHandleInputPorts(federate))); From 33452aa4ea64717dcaa2c9ec598bb65a45b3c6a1 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 15 Apr 2023 16:19:41 +0900 Subject: [PATCH 03/22] Match version --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 667a5d702c..6dfa1a0e57 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 667a5d702cbcd0288328417d8c632e6b5af19c04 +Subproject commit 6dfa1a0e573692af48f114c844fddb6de8d2cbab From 057777fa8e6f724178190164db9a00ba30febb17 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 15 Apr 2023 17:30:49 +0900 Subject: [PATCH 04/22] Remove prints. --- .../src/org/lflang/federated/extensions/CExtensionUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java index a0b391c4b7..c84bf36197 100644 --- a/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java +++ b/org.lflang/src/org/lflang/federated/extensions/CExtensionUtils.java @@ -245,7 +245,6 @@ public static void handleCompileDefinitions( federate.targetConfig.compileDefinitions.put("FEDERATED", ""); federate.targetConfig.compileDefinitions.put("FEDERATED_"+federate.targetConfig.coordination.toString().toUpperCase(), ""); if (federate.targetConfig.auth) { - System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"); federate.targetConfig.compileDefinitions.put("FEDERATED_AUTHENTICATED", ""); } federate.targetConfig.compileDefinitions.put("NUMBER_OF_FEDERATES", String.valueOf(numOfFederates)); From 9f650b2986d3763aaedfd787f91da1c4b36d047d Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 15 Apr 2023 19:48:38 +0900 Subject: [PATCH 05/22] Change ci.yml point --- .github/workflows/c-tests.yml | 2 ++ .github/workflows/ci.yml | 4 ++-- org.lflang/src/lib/c/reactor-c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 0764128a1b..8c85928ff1 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,6 +45,8 @@ jobs: brew install coreutils brew install openssl brew link openssl --force + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6dd56ae40..64a524ff8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: # Run the C integration tests. c-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test needs: cancel # Run the C Arduino integration tests. @@ -77,7 +77,7 @@ jobs: # Run the CCpp integration tests. ccpp-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test with: use-cpp: true needs: cancel diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 6dfa1a0e57..4920ead796 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 6dfa1a0e573692af48f114c844fddb6de8d2cbab +Subproject commit 4920ead7960d1d30d7b4ba6becfb1bd9362b81e5 From 4c844909d9edb36df7b892d54f5231842b9ca6f3 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 15 Apr 2023 22:08:22 +0900 Subject: [PATCH 06/22] Try removing OPENSSL_ROOT_DIR --- .github/workflows/c-tests.yml | 2 -- org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 8c85928ff1..0764128a1b 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,8 +45,6 @@ jobs: brew install coreutils brew install openssl brew link openssl --force - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index 3f5eb4a5b7..d8033a8465 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -227,9 +227,9 @@ CodeBuilder generateCMakeCode( if (targetConfig.platformOptions.platform != Platform.AUTO) { osName = targetConfig.platformOptions.platform.toString(); } - if (osName.contains("mac")) { - cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); - } + // if (osName.contains("mac")) { + // cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); + // } cMakeCode.pr("# Find OpenSSL and link to it"); cMakeCode.pr("find_package(OpenSSL REQUIRED)"); cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)"); From 381582983e81aa37ca505b2ef239353418aac364 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 00:34:23 +0900 Subject: [PATCH 07/22] Revert "Try removing OPENSSL_ROOT_DIR" This reverts commit 4c844909d9edb36df7b892d54f5231842b9ca6f3. --- .github/workflows/c-tests.yml | 2 ++ org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 0764128a1b..8c85928ff1 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,6 +45,8 @@ jobs: brew install coreutils brew install openssl brew link openssl --force + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index d8033a8465..3f5eb4a5b7 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -227,9 +227,9 @@ CodeBuilder generateCMakeCode( if (targetConfig.platformOptions.platform != Platform.AUTO) { osName = targetConfig.platformOptions.platform.toString(); } - // if (osName.contains("mac")) { - // cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); - // } + if (osName.contains("mac")) { + cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); + } cMakeCode.pr("# Find OpenSSL and link to it"); cMakeCode.pr("find_package(OpenSSL REQUIRED)"); cMakeCode.pr("target_link_libraries( ${LF_MAIN_TARGET} PRIVATE OpenSSL::SSL)"); From 114dd25df58e36230d52c5b906afaf361d4f749e Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 00:44:00 +0900 Subject: [PATCH 08/22] Add library path --- .github/workflows/c-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 8c85928ff1..9d175941ed 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,8 +45,7 @@ jobs: brew install coreutils brew install openssl brew link openssl --force - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" + export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/ if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti From 145edf9e362d372861717a0138f1d66b1f166d9c Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 18:28:28 +0900 Subject: [PATCH 09/22] Add openssl to runner PATH --- .github/workflows/c-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 9d175941ed..fbb2669090 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,7 +45,9 @@ jobs: brew install coreutils brew install openssl brew link openssl --force - export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/ + echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti From 6cfd90a6a62dc23af989f6c5e6fe3eb4f00e0677 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 19:35:27 +0900 Subject: [PATCH 10/22] Update reactor-c --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 4920ead796..1d573dac67 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 4920ead7960d1d30d7b4ba6becfb1bd9362b81e5 +Subproject commit 1d573dac6775c09bdec92b28a0a5fad5c88476f7 From e00e62e5e1624961f2997b58a65761907fed1443 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 20:39:14 +0900 Subject: [PATCH 11/22] Try brew reinstall openssl --- .github/workflows/c-tests.yml | 8 ++++---- org.lflang/src/lib/c/reactor-c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index fbb2669090..c0539a1c46 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -43,11 +43,11 @@ jobs: - name: Install dependencies OS X run: | brew install coreutils - brew install openssl + brew reinstall openssl brew link openssl --force - echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" + # echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile + # export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + # export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 1d573dac67..8525a1fa27 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 1d573dac6775c09bdec92b28a0a5fad5c88476f7 +Subproject commit 8525a1fa27fdf3b420871ff0121b0f374fc3f053 From 69934f1271b5fb09a586eeb1b06b66257f487989 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sun, 16 Apr 2023 22:31:47 +0900 Subject: [PATCH 12/22] Try add openssl@3 --- org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index 3f5eb4a5b7..1c7c68f676 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -228,7 +228,7 @@ CodeBuilder generateCMakeCode( osName = targetConfig.platformOptions.platform.toString(); } if (osName.contains("mac")) { - cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); + cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl@3)"); } cMakeCode.pr("# Find OpenSSL and link to it"); cMakeCode.pr("find_package(OpenSSL REQUIRED)"); From f3f99c1727220c3ba1af24a193e2de9995fedc32 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Mon, 17 Apr 2023 10:27:18 +0900 Subject: [PATCH 13/22] Try ssh --- .github/workflows/c-tests.yml | 12 ++++++++---- .../src/org/lflang/generator/c/CCmakeGenerator.java | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index c0539a1c46..da060ce38a 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -23,6 +23,10 @@ jobs: matrix: platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} + steps: + - uses: actions/checkout@v2 + - name: Setup upterm session + uses: lhotari/action-upterm@v1 steps: - name: Check out lingua-franca repository uses: actions/checkout@v3 @@ -43,11 +47,11 @@ jobs: - name: Install dependencies OS X run: | brew install coreutils - brew reinstall openssl + brew install openssl brew link openssl --force - # echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile - # export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - # export CPPFLAGS="-I/usr/local/opt/openssl@3/include" + echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile + export LDFLAGS="-L/usr/local/opt/openssl@3/lib" + export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index 1c7c68f676..3f5eb4a5b7 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -228,7 +228,7 @@ CodeBuilder generateCMakeCode( osName = targetConfig.platformOptions.platform.toString(); } if (osName.contains("mac")) { - cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl@3)"); + cMakeCode.pr("set(OPENSSL_ROOT_DIR /usr/local/opt/openssl)"); } cMakeCode.pr("# Find OpenSSL and link to it"); cMakeCode.pr("find_package(OpenSSL REQUIRED)"); From 414970ff2c04df9e62d866b1d2b75f4e361f175a Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Thu, 20 Apr 2023 11:17:59 +0900 Subject: [PATCH 14/22] Fix ssh --- .github/workflows/c-tests.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index da060ce38a..ce13f0cee8 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -24,10 +24,8 @@ jobs: platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: - - uses: actions/checkout@v2 - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - steps: + - name: Setup upterm session + uses: lhotari/action-upterm@v1 - name: Check out lingua-franca repository uses: actions/checkout@v3 with: From b63b27546ba93664566963683f5f427813358769 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Thu, 20 Apr 2023 13:56:29 +0900 Subject: [PATCH 15/22] Fix ssh to last --- .github/workflows/c-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index ce13f0cee8..ed1ba0d784 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -24,8 +24,6 @@ jobs: platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - name: Check out lingua-franca repository uses: actions/checkout@v3 with: @@ -74,3 +72,5 @@ jobs: fail_ci_if_error: false verbose: true if: ${{ !inputs.compiler-ref }} # i.e., if this is part of the main repo's CI + - name: Setup upterm session + uses: lhotari/action-upterm@v1 \ No newline at end of file From 02b02e56af7a952a903dc9e85091c57c6c1952b2 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 21 Apr 2023 17:01:03 +0900 Subject: [PATCH 16/22] Revert ci test changes --- .github/workflows/c-tests.yml | 3 --- .github/workflows/ci.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index ed1ba0d784..79c66d8ab4 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -45,9 +45,6 @@ jobs: brew install coreutils brew install openssl brew link openssl --force - echo 'export PATH="/usr/local/opt/openssl@3/bin:$PATH"' >> /Users/runner/.bash_profile - export LDFLAGS="-L/usr/local/opt/openssl@3/lib" - export CPPFLAGS="-I/usr/local/opt/openssl@3/include" if: ${{ runner.os == 'macOS' }} - name: Install RTI uses: ./.github/actions/install-rti diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64a524ff8f..f6dd56ae40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: # Run the C integration tests. c-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master needs: cancel # Run the C Arduino integration tests. @@ -77,7 +77,7 @@ jobs: # Run the CCpp integration tests. ccpp-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master with: use-cpp: true needs: cancel From 37936c5072359955b1dbc040039147975d64e657 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 21 Apr 2023 17:01:56 +0900 Subject: [PATCH 17/22] Delete ssh --- .github/workflows/c-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 79c66d8ab4..b02775ad65 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -69,5 +69,4 @@ jobs: fail_ci_if_error: false verbose: true if: ${{ !inputs.compiler-ref }} # i.e., if this is part of the main repo's CI - - name: Setup upterm session - uses: lhotari/action-upterm@v1 \ No newline at end of file + \ No newline at end of file From 42cc3fd9e3a70b86262edfaa752920ead5935e5b Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 21 Apr 2023 17:02:44 +0900 Subject: [PATCH 18/22] Remove unneeded line --- .github/workflows/c-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index b02775ad65..0764128a1b 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -69,4 +69,3 @@ jobs: fail_ci_if_error: false verbose: true if: ${{ !inputs.compiler-ref }} # i.e., if this is part of the main repo's CI - \ No newline at end of file From f2b3eadaca7d82be3f6829eeb1345ff38dcbb2b1 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Fri, 21 Apr 2023 17:12:00 +0900 Subject: [PATCH 19/22] Checkout reactor-c auth-fail-test branch --- org.lflang/src/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 9d939578e0..6d0854a9eb 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 9d939578e095029deab5153326362555fad0382b +Subproject commit 6d0854a9ebb0ff06a774e28a12dcef0118037f06 From fad460269503802f255a857802591b38b4b8e7c2 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 22 Apr 2023 14:06:11 +0900 Subject: [PATCH 20/22] Check if os.type is working --- .github/workflows/c-tests.yml | 2 ++ org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 0764128a1b..37f0c2bed3 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -49,6 +49,8 @@ jobs: - name: Install RTI uses: ./.github/actions/install-rti if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} + - name: Setup upterm session + uses: lhotari/action-upterm@v1 - name: Perform tests for C target with default scheduler run: | ./gradlew test --tests org.lflang.tests.runtime.CTest.* diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index 3f5eb4a5b7..0028064641 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -223,6 +223,8 @@ CodeBuilder generateCMakeCode( if(targetConfig.auth) { // If security is requested, add the auth option. var osName = System.getProperty("os.name").toLowerCase(); + System.out.println(osName); + System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); // if platform target was set, use given platform instead if (targetConfig.platformOptions.platform != Platform.AUTO) { osName = targetConfig.platformOptions.platform.toString(); From 9e67b93c131aa49011fcad840f3f3d42c372fb98 Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 22 Apr 2023 14:19:13 +0900 Subject: [PATCH 21/22] Change pointing ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6dd56ae40..7f3da5fe92 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: # Run the C integration tests. c-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test needs: cancel # Run the C Arduino integration tests. From 68b0090184593e0aa286a3589d3a639f9cae272b Mon Sep 17 00:00:00 2001 From: Jakio815 Date: Sat, 22 Apr 2023 14:47:46 +0900 Subject: [PATCH 22/22] Remove ci test changes --- .github/workflows/c-tests.yml | 2 -- .github/workflows/ci.yml | 2 +- org.lflang/src/lib/c/reactor-c | 2 +- org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml index 37f0c2bed3..0764128a1b 100644 --- a/.github/workflows/c-tests.yml +++ b/.github/workflows/c-tests.yml @@ -49,8 +49,6 @@ jobs: - name: Install RTI uses: ./.github/actions/install-rti if: ${{ runner.os == 'macOS' || runner.os == 'Linux' }} - - name: Setup upterm session - uses: lhotari/action-upterm@v1 - name: Perform tests for C target with default scheduler run: | ./gradlew test --tests org.lflang.tests.runtime.CTest.* diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f3da5fe92..f6dd56ae40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: # Run the C integration tests. c-tests: - uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@auth-fail-test + uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master needs: cancel # Run the C Arduino integration tests. diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c index 6d0854a9eb..f344f55e67 160000 --- a/org.lflang/src/lib/c/reactor-c +++ b/org.lflang/src/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit 6d0854a9ebb0ff06a774e28a12dcef0118037f06 +Subproject commit f344f55e678d2eb4d7a40eb4725ea2dcc3baf897 diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java index 0028064641..3f5eb4a5b7 100644 --- a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java +++ b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java @@ -223,8 +223,6 @@ CodeBuilder generateCMakeCode( if(targetConfig.auth) { // If security is requested, add the auth option. var osName = System.getProperty("os.name").toLowerCase(); - System.out.println(osName); - System.out.println("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); // if platform target was set, use given platform instead if (targetConfig.platformOptions.platform != Platform.AUTO) { osName = targetConfig.platformOptions.platform.toString();