Skip to content

Commit

Permalink
Merge pull request #250 from toradex/dev
Browse files Browse the repository at this point in the history
Release v2.6
  • Loading branch information
andreriesco authored Aug 30, 2024
2 parents cbcbcde + 7aed516 commit 4d76678
Show file tree
Hide file tree
Showing 335 changed files with 8,265 additions and 9,055 deletions.
23 changes: 18 additions & 5 deletions .github/workflows/build-ccpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,26 +15,32 @@ jobs:
project:
- folder: cppQML
container: cpp-qml
arch: arm64
vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

- folder: cppSlint
container: cpp-slint
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -45,5 +51,12 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-container-torizon-release-${env:PROJECT_ARCH}
26 changes: 20 additions & 6 deletions .github/workflows/build-debug-ccpp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,32 @@ jobs:
project:
- folder: cppQML
container: cpp-qml
arch: arm64
vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

- folder: cppSlint
container: cpp-slint
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Build ${{ matrix.project.folder }} Dockerfile.debug
- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -44,9 +51,16 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
# TODO: this is bad, but it's the only way to make it work for now
chmod 777 . -R
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-debug-${env:PROJECT_ARCH}
./.vscode/tasks.ps1 run build-container-torizon-debug-${env:PROJECT_ARCH}
24 changes: 19 additions & 5 deletions .github/workflows/build-debug-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,28 @@ jobs:
project:
- folder: python3Console
container: python3-console
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Build ${{ matrix.project.folder }} Dockerfile.debug
- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -40,5 +47,12 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-container-torizon-debug-${env:PROJECT_ARCH}
25 changes: 20 additions & 5 deletions .github/workflows/build-debug-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,28 @@ jobs:
project:
- folder: rustSlint
container: rust-slint
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Build ${{ matrix.project.folder }} Dockerfile.debug
- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -40,10 +47,18 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
# TODO: this is bad, but it's the only way to make it work for now
chmod 777 . -R
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-debug-${env:PROJECT_ARCH}
./.vscode/tasks.ps1 run copy-debug-executable-${env:PROJECT_ARCH}
./.vscode/tasks.ps1 run build-container-torizon-debug-${env:PROJECT_ARCH}
21 changes: 17 additions & 4 deletions .github/workflows/build-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,28 @@ jobs:
project:
- folder: python3Console
container: python3-console
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -41,5 +47,12 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-container-torizon-release-${env:PROJECT_ARCH}
21 changes: 17 additions & 4 deletions .github/workflows/build-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,28 @@ jobs:
project:
- folder: rustSlint
container: rust-slint
arch: arm64

vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"

steps:
- uses: actions/checkout@v3

- name: Get Host Absolute Workspace Path
run: |
echo "${{ github.workspace }}" >> abs-path
cat abs-path
- name: Build ${{ matrix.project.folder }} Dockerfile
shell: pwsh
env:
PROJECT_FOLDER: ${{ matrix.project.folder }}
PROJECT_CONTAINER: ${{ matrix.project.container }}
PROJECT_ARCH: ${{ matrix.project.arch }}
VENDOR: ${{ matrix.project.vendor }}
DOCKER_LOGIN: localhost:5002

run: |
docker run --rm --privileged torizon/binfmt
$_vendor = ($env:VENDOR | ConvertFrom-Json)
$env:TORIZON_ARCH = $_vendor.torizon_arch
$env:PROJECT_ARCH = $_vendor.arch
scripts/createFromTemplate.ps1 `
$env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `
Expand All @@ -41,5 +47,12 @@ jobs:
false `
false
cp abs-path "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
cd "${env:GITHUB_WORKSPACE}/${env:PROJECT_FOLDER}CITest"
$_settingsJson = Get-Content -Path ".vscode/settings.json" | ConvertFrom-Json
$_settingsJson.torizon_arch = $env:TORIZON_ARCH
Set-Content -Path ".vscode/settings.json" -Value ($_settingsJson | ConvertTo-Json) -Encoding UTF8
./.vscode/tasks.ps1 run run-torizon-binfmt
./.vscode/tasks.ps1 run build-container-torizon-release-${env:PROJECT_ARCH}
18 changes: 16 additions & 2 deletions .github/workflows/ci-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ on:
push:
branches:
- dev
- bookworm
pull_request:
branches:
- dev

jobs:
spell-check:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/bookworm' || github.ref == 'refs/heads/dev'
container:
image: node:18
name: Spell Check
Expand All @@ -22,3 +23,16 @@ jobs:
run: |
npm install git+https://github.com/streetsidesoftware/cspell-cli
npx cspell-cli lint --relative
check-eof-new-line:
runs-on: ubuntu-latest
name: Check EOF New Line
steps:
- uses: actions/checkout@v3

- name: Check EOF New Line

shell: pwsh

run: |
./scripts/validNewLine.ps1
19 changes: 18 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,23 @@
}
],
"tasksLabel.includeFiles": [
"assets/tasks/common.json"
"assets/tasks/common.json",
// "cConsole/.vscode/tasks.json",
// "cppConsole/.vscode/tasks.json",
// "cmakeConsole/.vscode/tasks.json",
// "gambasForms/.vscode/tasks.json",
// "aspnetBlazor/.vscode/tasks.json",
// "python3Console/.vscode/tasks.json",
// "python3Pyside2QML/.vscode/tasks.json",
// "cppQML/.vscode/tasks.json",
// "javaForms/.vscode/tasks.json",
// "monoCsharpForms/.vscode/tasks.json",
// "dotnetSlint/.vscode/tasks.json",
// "dotnetAvaloniaFrameBuffer/.vscode/tasks.json",
// "dotnetAvalonia/.vscode/tasks.json",
// "dotnetUno5/.vscode/tasks.json",
// "dotnetUno5FrameBuffer/.vscode/tasks.json",
// "cppSlint/.vscode/tasks.json",
"tcb/.vscode/tasks.json"
]
}
22 changes: 21 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
},
"group": "build"
},
{
"label": "check-eof-new-line",
"command": "pwsh",
"type": "shell",
"options": {
"cwd": "${workspaceFolder}"
},
"args": [
"-nop",
"-f",
"./scripts/validNewLine.ps1"
],
"problemMatcher": [
"$gcc"
],
"presentation": {
"reveal": "always"
},
"group": "build"
},
{
"label": "install-cspell",
"command": "npm",
Expand Down Expand Up @@ -69,7 +89,7 @@
"type": "shell",
"command": "git",
"args": [
"checkout",
"checkout",
"bullseye",
"&&",
"git",
Expand Down
Loading

0 comments on commit 4d76678

Please sign in to comment.