Skip to content

Commit

Permalink
Merge main into branch rti-DNET
Browse files Browse the repository at this point in the history
  • Loading branch information
byeonggiljun committed Mar 15, 2024
2 parents 24e1e3b + 7427d98 commit 800b570
Show file tree
Hide file tree
Showing 195 changed files with 18,332 additions and 19,154 deletions.
9 changes: 9 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
BasedOnStyle: LLVM
Language: Cpp
IndentWidth: 2
BreakConstructorInitializersBeforeComma: 'true'
PointerAlignment: Left
IncludeBlocks: Preserve
SortIncludes: false
ColumnLimit: 120
46 changes: 0 additions & 46 deletions .github/workflows/check-diff.yml

This file was deleted.

40 changes: 24 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@ on:
branches:
- main
pull_request:
# Also allow running this workflow manually from the Actions tab.
types: [synchronize, opened, reopened, ready_for_review, converted_to_draft]
workflow_dispatch:
merge_group:

concurrency:
group: ci-${{ github.ref }}-${{ github.event_path }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

jobs:
check-labels:
uses: lf-lang/lingua-franca/.github/workflows/check-labels.yml@master
if: ${{ github.event_name == 'pull_request' }}

unit-tests-single:
uses: ./.github/workflows/unit-tests.yml
with:
Expand All @@ -25,60 +34,59 @@ jobs:
build-trace-tools:
uses: ./.github/workflows/build-trace-tools.yml

check-diff:
uses: ./.github/workflows/check-diff.yml

fetch-lf:
uses: lf-lang/lingua-franca/.github/workflows/extract-ref.yml@master
with:
file: 'lingua-franca-ref.txt'

lf-default-arduino:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/c-arduino-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
if: ${{ needs.check-diff.outputs.run_arduino == 'true' }}
if: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'arduino') }}

lf-default-zephyr:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/c-zephyr-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
if: ${{ needs.check-diff.outputs.run_zephyr == 'true' }}
if: ${{ !github.event.pull_request.draft ||contains( github.event.pull_request.labels.*.name, 'zephyr') }}

lf-default:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
all-platforms: ${{ needs.check-diff.outputs.run_macos == 'true' || needs.check-diff.outputs.run_windows == 'true' }}
all-platforms: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'mac') || contains( github.event.pull_request.labels.*.name, 'windows') }}

lf-python:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
with:
reactor-c-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
if: ${{ needs.check-diff.outputs.run_python == 'true' }}
if: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'python') }}

lf-gedf-np:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
scheduler: GEDF_NP
all-platforms: ${{ needs.check-diff.outputs.run_macos == 'true' || needs.check-diff.outputs.run_windows == 'true' }}
all-platforms: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'mac') || contains( github.event.pull_request.labels.*.name, 'windows') }}
if: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'schedulers') }}

lf-adaptive:
needs: [fetch-lf, check-diff]
needs: [fetch-lf]
uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
with:
runtime-ref: ${{ github.ref }}
compiler-ref: ${{ needs.fetch-lf.outputs.ref }}
scheduler: ADAPTIVE
all-platforms: ${{ needs.check-diff.outputs.run_macos == 'true' || needs.check-diff.outputs.run_windows == 'true' }}
all-platforms: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'mac') || contains( github.event.pull_request.labels.*.name, 'windows') }}
if: ${{ !github.event.pull_request.draft || contains( github.event.pull_request.labels.*.name, 'schedulers') }}
16 changes: 16 additions & 0 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: clang-format-review

# You can be more specific, but it currently only works on pull requests
on: [pull_request]

jobs:
clang-format:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: Install clang-tidy
run: |
sudo apt-get update
sudo apt-get install -y clang-tidy
- name: Analyze
run: make format-check
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
/docs/_build
/docs/api
**/.vscode/
/build/
**/build/
**/lib/
**/.DS_Store
/core/federated/RTI/build/
/cmake-build-debug/
Expand Down
Loading

0 comments on commit 800b570

Please sign in to comment.