Merge pull request #2458 from lf-lang/ubuntu-24.04

Move CI to ubuntu-24.04
lf-lang · Jan 23, 2025 · 50a1e82 · 50a1e82
2 parents 35ebba7 + 68dfeb7
commit 50a1e82
Show file tree

Hide file tree

Showing 32 changed files with 58 additions and 47 deletions.
diff --git a/.github/actions/setup-flexpret/action.yml b/.github/actions/setup-flexpret/action.yml
@@ -3,6 +3,10 @@ description: Install FlexPRET and dependencies (Linux only)
 runs:
   using: "composite"
   steps:
+    - name: Setup Scala
+      uses: olafurpg/setup-scala@v11
+      with:
+        java-version: [email protected]
     - name: Setup
       run: |
         # Clone the FlexPRET repository

diff --git a/.github/actions/setup-ros2/action.yml b/.github/actions/setup-ros2/action.yml
@@ -1,14 +1,9 @@
-name: Install ROS2 rolling (Linux only)
-description: Install ROS2 rolling (Linux only)
+name: Install ROS2 jazzy (Linux only)
+description: Install ROS2 jazzy (Linux only)
 runs:
   using: "composite"
   steps:
-   - if: runner.os == 'Linux'
-     shell: bash
-     # azure ubuntu repo can be flaky so add an alternate source
-     # see https://github.com/ros-tooling/setup-ros/issues/80 and https://github.com/ros2/rmw_cyclonedds/pull/134
-     run: sed -e 's/azure.archive.ubuntu.com/us.archive.ubuntu.com/g' -e t -e d /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/nonazure.list
    - name: Setup ROS2
-     uses: ros-tooling/[email protected].0
+     uses: ros-tooling/[email protected].9
      with:
-       required-ros-distributions: rolling
+       required-ros-distributions: jazzy
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
   build-toolchain:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/c-arduino-tests.yml b/.github/workflows/c-arduino-tests.yml
@@ -25,7 +25,7 @@ jobs:
   arduino-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/c-flexpret-tests.yml b/.github/workflows/c-flexpret-tests.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   flexpret-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/c-patmos-tests.yml b/.github/workflows/c-patmos-tests.yml
@@ -23,7 +23,7 @@ on:
 
 jobs:
   Patmos-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/c-tests.yml b/.github/workflows/c-tests.yml
@@ -25,7 +25,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:

diff --git a/.github/workflows/c-verifier-tests.yml b/.github/workflows/c-verifier-tests.yml
@@ -15,7 +15,7 @@ jobs:
   run:
     strategy:
       matrix:
-        platform: [ubuntu-latest]
+        platform: [ubuntu-24.04]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository
@@ -34,6 +34,10 @@ jobs:
           path: core/src/main/resources/lib/c/reactor-c
           ref: ${{ inputs.runtime-ref }}
         if: ${{ inputs.runtime-ref }}
+      - name: Setup Scala
+        uses: olafurpg/setup-scala@v11
+        with:
+          java-version: [email protected]
       - name: Check out Uclid5 repository
         uses: actions/checkout@v3
         with:
@@ -54,6 +58,7 @@ jobs:
       - name: Install Uclid5
         working-directory: uclid/
         run: |
+
           sbt update clean compile
           sbt universal:packageBin
           cd target/universal/

diff --git a/.github/workflows/c-zephyr-tests.yml b/.github/workflows/c-zephyr-tests.yml
@@ -19,7 +19,7 @@ on:
 
 jobs:
   zephyr-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   cancel:
     name: run
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 3
     steps:
       - uses: styfle/[email protected]

diff --git a/.github/workflows/check-diff.yml b/.github/workflows/check-diff.yml
@@ -30,7 +30,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       skip: ${{ steps.should-skip.outputs.skip == 'true' }}
       run_c: ${{ steps.do.outputs.changed_c == 1 || !github.event.pull_request.draft }}

diff --git a/.github/workflows/check-labels.yml b/.github/workflows/check-labels.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check that a label has been assigned
         uses: mheap/github-action-required-labels@v5

diff --git a/.github/workflows/cli-tests.yml b/.github/workflows/cli-tests.yml
@@ -12,7 +12,7 @@ jobs:
   test-cli:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/cpp-ros2-tests.yml b/.github/workflows/cpp-ros2-tests.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   cpp-ros2-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/cpp-tests.yml b/.github/workflows/cpp-tests.yml
@@ -18,7 +18,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:
@@ -39,7 +39,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y clang-tidy
           sudo apt-get install -y lcov
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Check out specific ref of reactor-cpp
         uses: actions/checkout@v2
         with:
@@ -60,15 +60,15 @@ jobs:
           lcov --capture --directory test/Cpp --output-file coverage.info
           lcov --extract coverage.info ${GITHUB_WORKSPACE}/test/Cpp/src-gen/reactor-cpp-default/\* --output-file reactor-cpp.info
           genhtml reactor-cpp.info --output-directory reactor-cpp.coverage
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Upload coverage report
         uses: actions/upload-artifact@v3
         with:
           name: reactor-cpp.coverage
           path: reactor-cpp.coverage
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-24.04'
       - name: Report to CodeCov
         uses: ./.github/actions/report-code-coverage
         with:
           files: reactor-cpp.info
-        if: ${{ github.repository == 'lf-lang/lingua-franca' && matrix.platform == 'ubuntu-latest' }}
+        if: ${{ github.repository == 'lf-lang/lingua-franca' && matrix.platform == 'ubuntu-24.04' }}
diff --git a/.github/workflows/custom-build.yml b/.github/workflows/custom-build.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   custom-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/extract-ref.yml b/.github/workflows/extract-ref.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   extract-ref:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       ref: ${{ steps.read.outputs.ref }}
     steps:

diff --git a/.github/workflows/latest-release.yml b/.github/workflows/latest-release.yml
@@ -32,7 +32,7 @@ on:
 
 jobs:
   get-latest-release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       ref: ${{ steps.semver.outputs.ref }}
       ver: ${{ steps.semver.outputs.ver }}

diff --git a/.github/workflows/lsp-tests.yml b/.github/workflows/lsp-tests.yml
@@ -16,7 +16,7 @@ jobs:
   test-lsp:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       # Uninstall operations are needed because the language server is able to use multiple

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   nightly-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
@@ -21,7 +21,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/rs-tests.yml b/.github/workflows/rs-tests.yml
@@ -24,7 +24,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
         rust: [stable]
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 60

diff --git a/.github/workflows/rti-docker.yml b/.github/workflows/rti-docker.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build-and-push:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Build and push RTI to Docker Hub
     steps:
       - name: Check out lingua-franca repository

diff --git a/.github/workflows/serialization-tests.yml b/.github/workflows/serialization-tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   serialization-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -28,11 +28,16 @@ jobs:
       - name: Install Protobuf Ubuntu
         run: |
           sudo apt-get update
-          sudo apt-get install -y libprotobuf-c-dev protobuf-c-compiler protobuf-compiler libprotobuf-dev python3-protobuf
+          sudo apt-get install -y libprotobuf-c-dev protobuf-c-compiler protobuf-compiler libprotobuf-dev
+          npm install -g protoc-gen-js
       - name: Install LinguaFrancaBase
-        run: pip3 install LinguaFrancaBase
+        run: |
+          python3 -m venv .venv
+          source .venv/bin/activate
+          pip install LinguaFrancaBase protobuf
       - name: Run serialization tests;
         run: |
+          source .venv/bin/activate
           source /opt/ros/*/setup.bash
           ./gradlew core:integrationTest --tests org.lflang.tests.serialization.SerializationTest.* core:integrationTestCodeCoverageReport
       - name: Report to CodeCov

diff --git a/.github/workflows/ts-tests.yml b/.github/workflows/ts-tests.yml
@@ -12,7 +12,7 @@ jobs:
   regular-tests:
     strategy:
       matrix:
-        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-latest", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-latest"]') }}
+        platform: ${{ (inputs.all-platforms && fromJSON('["ubuntu-24.04", "macos-latest", "windows-latest"]')) || fromJSON('["ubuntu-24.04"]') }}
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 120
     steps:

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppRos2Generator.kt
@@ -16,7 +16,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
     private val packageGenerator = CppRos2PackageGenerator(generator, nodeGenerator.nodeName)
 
     companion object {
-        const val DEFAULT_BASE_IMAGE: String = "ros:rolling-ros-base"
+        const val DEFAULT_BASE_IMAGE: String = "ros:jazzy-ros-base"
     }
 
     override fun generatePlatformFiles() {
@@ -116,7 +116,7 @@ class CppRos2Generator(generator: CppGenerator) : CppPlatformGenerator(generator
             if (script.isNotEmpty()) {
                 return mutableListOf(". src/" + StringEscapeUtils.escapeXSI(script))
             }
-            return mutableListOf(". /opt/ros/rolling/setup.sh")
+            return mutableListOf(". /opt/ros/jazzy/setup.sh")
         }
 
         override fun getPostBuildCommand(): MutableList<String> {

diff --git a/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt b/core/src/main/kotlin/org/lflang/generator/cpp/CppStandaloneCmakeGenerator.kt
@@ -60,7 +60,7 @@ class CppStandaloneCmakeGenerator(private val targetConfig: TargetConfig, privat
             |  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             |    find_program(LCOV_BIN lcov)
             |    if(LCOV_BIN MATCHES "lcov$S")
-            |      set(CMAKE_CXX_FLAGS "$S{CMAKE_CXX_FLAGS} --coverage -fprofile-arcs -ftest-coverage")
+            |      set(CMAKE_CXX_FLAGS "$S{CMAKE_CXX_FLAGS} --coverage -fprofile-arcs -ftest-coverage -fprofile-update=atomic")
             |    else()
             |      message("Not producing code coverage information since lcov was not found")
             |    endif()

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
diff --git a/core/src/main/resources/lib/rs/reactor-rs b/core/src/main/resources/lib/rs/reactor-rs
diff --git a/core/src/main/resources/lib/rs/runtime-version.properties b/core/src/main/resources/lib/rs/runtime-version.properties
@@ -1 +1 @@
-rs = 10fee74e32a72f15ec3bc5605d61c27f63c8e037
+rs = bca71291d2b9547863bd42171872203336e9ec3f
diff --git a/test/Python/src/serialization/CustomSerializer.lf b/test/Python/src/serialization/CustomSerializer.lf
@@ -1,13 +1,15 @@
 # To run this test, the `pickle_serializer` package must be installed in the Python environment.
 # Run `pip3 install -e ./test/Python/src/serialization/pickle_serializer` in the project root directory to install the pickle_serializer.
 target Python {
-  coordination: decentralized
+  coordination: decentralized,
+  files: ["pickle_serializer"]
 }
 
 preamble {=
   # Note that both federates will try to install the pickle_serializer package. One will likely fail,
   # but the other will succeed.
-  os.system("pip install ./src/serialization/pickle_serializer/ --user")
+  cwd = os.path.abspath(__file__)
+  os.system(f"pip install {cwd}/../pickle_serializer/")
   import pickle_serializer
 =}
+2 −2		.github/workflows/build-rti.yml
+1 −1		.github/workflows/build-trace-tools.yml
+1 −1		.github/workflows/unit-tests.yml
+1 −1		lingua-franca-ref.txt
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		rs = 10fee74e32a72f15ec3bc5605d61c27f63c8e037
		rs = bca71291d2b9547863bd42171872203336e9ec3f