Merge branch 'master' into python-11

.github/actions/setup-zephyr/action.yml

@@ -5,8 +5,7 @@ runs:
   steps:
     - name: Setup environment variables
       run: |
-        echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
-        echo "ZEPHYR_VERSION=3.4.0" >> $GITHUB_ENV
+        echo "SDK_VERSION=0.16.3" >> $GITHUB_ENV
       shell: bash
     - name: Dependencies
       run: |
@@ -27,14 +26,14 @@ runs:
         cd "/opt/zephyr-sdk-${{env.SDK_VERSION}}"
         sudo ./setup.sh -t all -h -c
       shell: bash
-    - name: Download and install Zephyr RTOS
+    - name: Download and install Zephyr RTOS with the lf-west-template
       run: |
           cd $HOME
-          west init zephyrproject --mr "v${{env.ZEPHYR_VERSION}}"
-          cd zephyrproject
+          git clone https://github.com/lf-lang/lf-west-template && cd lf-west-template
           west update
           west zephyr-export
-          pip install -r zephyr/scripts/requirements.txt
-          echo "ZEPHYR_BASE=$HOME/zephyrproject/zephyr" >> $GITHUB_ENV
+          pip install -r deps/zephyr/scripts/requirements.txt
+          echo "LF_WEST_TEMPLATE_BASE=$HOME/lf-west-template" >> $GITHUB_ENV
+          echo "ZEPHYR_BASE=$HOME/lf-west-template/deps/zephyr" >> $GITHUB_ENV
           echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${{env.SDK_VERSION}}/" >> $GITHUB_ENV
       shell: bash

.github/scripts/run-zephyr-tests.sh

@@ -8,8 +8,8 @@ num_successes=0
 num_failures=0
 failed_tests=""
 
-# Skip
-skip=("FileReader" "FilePkgReader" "Tracing" "ThreadedThreaded")
+# Skip tests doing file IO and tracing
+skip=("FileReader" "FilePkgReader" "Tracing" "ThreadedThreaded" "CountTest" "AsyncCallback")
 
 find_kconfig_folders() {
     if [ -f "$folder/CMakeLists.txt" ]; then

.github/workflows/README.md

@@ -1,9 +1,8 @@
 # Lingua Franca workflows
 
 ## Continuous Integration
-The main CI configuration can be found in [ci.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/ci.yml) and gets triggered by pushes to `master` and by pushes to branches involved in an open pull request.
+The main two CI configurations can be found in [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml). The [all-misc.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-misc.yml) workflow runs the non-target specific tests, and [all-targets.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/all-targets.yml) workflow runs the target specific tests. They get triggered by pushes to `master` and by pushes to branches involved in an open pull request.
 
-**NOTE: [ci.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/ci.yml) references these workflows with respect to master (signified by the "@master" suffix). If you edit a workflow and want your changes reflected in the CI run for your pull request, then make sure that the workflow of your feature branch gets invoked instead of the one on master (and change back to "@master" before merging so that the feature branch can be safely deleted).**
 
 ### Benchmark tests
 The [benchmark-tests.yml](https://github.com/lf-lang/lingua-franca/blob/master/.github/workflows/lfc-tests.yml) workflow compiles and runs benchmarks for a given target. The purpose of this workflow is not to gather performance results but to ensure that the benchmark programs remain functional. This workflow has one (optional) argument:

.github/workflows/c-zephyr-tests.yml

@@ -60,6 +60,14 @@ jobs:
         run: |
           ./gradlew core:integrationTest --tests org.lflang.tests.runtime.CZephyrTest.buildZephyrBoards* core:integrationTestCodeCoverageReport
           rm -r test/C/src-gen
+      - name: Smoke test of lf-west-template
+        run: |
+          export LFC=$(pwd)/bin/lfc-dev
+          cd $LF_WEST_TEMPLATE_BASE
+          west lfc apps/HelloWorld/src/HelloWorld.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfBlinky.lf --lfc $LFC --build "-p always"
+          west lfc apps/NrfBlinky/src/NrfToggleGPIO.lf --lfc $LFC --build "-p always"
+          west build -b qemu_cortex_m3 -p always apps/HelloZephyr
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:

.github/workflows/nightly-build.yml

@@ -17,6 +17,12 @@ jobs:
           fetch-depth: 0
       - name: Prepare build environment
         uses: ./.github/actions/prepare-build-env
+      - name: Modify property file to contain the commit SHA
+        shell: bash
+        run: |
+          TIMESTAMP="$(date +'%Y-%m-%d')"
+          SHA="$(git rev-parse --short HEAD)"
+          sed --regexp-extended --in-place "s/^(VERSION = .*)$/\1 ${SHA} ${TIMESTAMP}/" core/src/main/resources/org/lflang/StringsBundle.properties
       - name: Build and package lf cli tools (nightly build)
         shell: bash
         run: |

CITATION.cff

@@ -0,0 +1,78 @@
+cff-version: 1.2.0
+title: Lingua Franca
+message: >-
+  If you use this software, please cite it using the
+  metadata from this file.
+type: software
+authors:
+  - given-names: Marten
+    family-names: Lohstroh
+    email: [email protected]
+    affiliation: UC Berkeley
+    orcid: 'https://orcid.org/0000-0001-8833-4117'
+  - given-names: Edward
+    family-names: Lee
+    email: [email protected]
+    affiliation: UC Berkeley
+    orcid: 'https://orcid.org/0000-0002-5663-0584'
+  - given-names: Soroush
+    family-names: Bateni
+    email: [email protected]
+    affiliation: UT Dallas
+    orcid: 'https://orcid.org/0000-0002-5448-3664'
+  - given-names: Christian
+    family-names: Menard
+    email: [email protected]
+    affiliation: TU Dresden
+    orcid: 'https://orcid.org/0000-0002-7134-8384'
+  - given-names: Peter
+    family-names: Donovan
+    email: [email protected]
+    affiliation: UC Berkeley
+  - given-names: Clément
+    family-names: Fournier
+    email: [email protected]
+    affiliation: TU Dresden
+  - given-names: Hou Seng (Steven)
+    family-names: Wong
+    email: [email protected]
+    affiliation: UC Berkeley
+  - given-names: Alexander
+    family-names: Schulz-Rosengarten
+    email: [email protected]
+    affiliation: Kiel University
+  - given-names: Erling Rennemo
+    family-names: Jellum
+    email: [email protected]
+    affiliation: NTNU
+  - given-names: Hokeun
+    family-names: Kim
+    email: [email protected]
+    affiliation: UC Berkeley
+  - given-names: Matt
+    family-names: Weber
+    email: [email protected]
+    affiliation: UC Berkeley
+  - given-names: Shaokai
+    family-names: Lin
+    email: [email protected]
+    affiliation: UC Berkeley
+  - given-names: Anirudh
+    family-names: Rengarajan
+    email: [email protected]
+    affiliation: UC Berkeley
+repository-code: 'https://github.com/lf-lang/lingua-franca'
+url: 'https://lf-lang.org/'
+abstract: >-
+  Lingua Franca is a polyglot coordination language for building complex
+  systems in a component-wise fashion with worry-free deterministic
+  concurrency, low-effort distribution, and time as a first-class citizen.
+keywords:
+  - coordination languages
+  - polyglot
+  - deterministic concurrency
+  - distributed systems
+  - embedded systems
+  - cloud computing
+  - realtime computing
+license: BSD-2-Clause