Merge pull request torizon#215 from andreriesco/dev

torizonPackages:Separate buildDeps from devDeps(renamed to devRuntime…
andreriesco · Jul 17, 2024 · 81da5e0 · 81da5e0
2 parents f31c8d7 + a26780e
commit 81da5e0
Show file tree

Hide file tree

Showing 33 changed files with 214 additions and 99 deletions.
diff --git a/.github/workflows/build-ccpp.yaml b/.github/workflows/build-ccpp.yaml
@@ -15,12 +15,11 @@ 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
@@ -30,10 +29,14 @@ jobs:
         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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -46,4 +49,9 @@ jobs:
             false
 
           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 build-container-torizon-release-${env:PROJECT_ARCH}
diff --git a/.github/workflows/build-debug-ccpp.yaml b/.github/workflows/build-debug-ccpp.yaml
@@ -15,24 +15,28 @@ 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: 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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -45,6 +49,11 @@ jobs:
             false
 
           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
 

diff --git a/.github/workflows/build-debug-python.yaml b/.github/workflows/build-debug-python.yaml
@@ -15,20 +15,24 @@ 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: 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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -41,4 +45,9 @@ jobs:
             false
 
           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 build-container-torizon-debug-${env:PROJECT_ARCH}
diff --git a/.github/workflows/build-debug-rust.yaml b/.github/workflows/build-debug-rust.yaml
@@ -15,20 +15,24 @@ 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: 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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -41,6 +45,11 @@ jobs:
             false
 
           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
 

diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml
@@ -15,8 +15,7 @@ jobs:
         project:
           - folder: python3Console
             container: python3-console
-            arch: arm64
-
+            vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"
 
     steps:
       - uses: actions/checkout@v3
@@ -26,10 +25,14 @@ jobs:
         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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -42,4 +45,9 @@ jobs:
             false
 
           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 build-container-torizon-release-${env:PROJECT_ARCH}
diff --git a/.github/workflows/build-rust.yaml b/.github/workflows/build-rust.yaml
@@ -15,8 +15,7 @@ jobs:
         project:
           - folder: rustSlint
             container: rust-slint
-            arch: arm64
-
+            vendor: "{ arch: 'arm64', torizon_arch: 'aarch64' }"
 
     steps:
       - uses: actions/checkout@v3
@@ -26,10 +25,14 @@ jobs:
         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: |
+          $_vendor = ($env:VENDOR | ConvertFrom-Json)
+          $env:TORIZON_ARCH = $_vendor.torizon_arch
+          $env:PROJECT_ARCH = $_vendor.arch
+
           docker run --rm --privileged torizon/binfmt
 
           scripts/createFromTemplate.ps1 `
@@ -42,4 +45,9 @@ jobs:
             false
 
           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 build-container-torizon-release-${env:PROJECT_ARCH}
diff --git a/assets/json/torizonPackages.json b/assets/json/torizonPackages.json
@@ -1,6 +1,6 @@
 {
-    "deps": [
+    "prodRuntimeDeps": [
     ],
-    "devDeps": [
+    "devRuntimeDeps": [
     ]
 }
diff --git a/cConsole/Dockerfile b/cConsole/Dockerfile
@@ -22,8 +22,8 @@ ARG IMAGE_ARCH
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cConsole/Dockerfile.sdk b/cConsole/Dockerfile.sdk
@@ -30,8 +30,8 @@ RUN apt-get -q -y update && \
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cmakeConsole/Dockerfile b/cmakeConsole/Dockerfile
@@ -23,8 +23,8 @@ RUN apt-get -q -y update && \
     apt-get -q -y install \
     cmake \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cmakeConsole/Dockerfile.sdk b/cmakeConsole/Dockerfile.sdk
@@ -32,8 +32,8 @@ RUN apt-get -q -y update && \
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppConsole/Dockerfile b/cppConsole/Dockerfile
@@ -22,8 +22,8 @@ ARG IMAGE_ARCH
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppConsole/Dockerfile.sdk b/cppConsole/Dockerfile.sdk
@@ -31,8 +31,8 @@ RUN apt-get -q -y update && \
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppQML/Dockerfile b/cppQML/Dockerfile
@@ -72,8 +72,8 @@ RUN apt-get -q -y update && \
     libqt6opengl6-dev \
     # ADD YOUR PACKAGES HERE
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppQML/Dockerfile.sdk b/cppQML/Dockerfile.sdk
@@ -78,8 +78,8 @@ RUN apt-get -q -y update && \
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppSlint/Dockerfile b/cppSlint/Dockerfile
@@ -38,8 +38,8 @@ ENV PATH=/cargo/bin:/rust/bin:$PATH
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/cppSlint/Dockerfile.sdk b/cppSlint/Dockerfile.sdk
@@ -30,8 +30,8 @@ ARG APP_ROOT
 RUN apt-get -q -y update && \
     apt-get -q -y install \
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \

diff --git a/dotnetAvaloniaFrameBuffer/Dockerfile b/dotnetAvaloniaFrameBuffer/Dockerfile
@@ -73,8 +73,8 @@ RUN apt-get -q -y update && \
 RUN apt-get -y update && apt-get install -y --no-install-recommends \
     # ADD YOUR PACKAGES HERE
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_prod_start__
+    # __torizon_packages_prod_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     libice6 \
     libsm6 \

diff --git a/gambasForms/Dockerfile b/gambasForms/Dockerfile
@@ -35,8 +35,8 @@ WORKDIR /build
 RUN apt-get -y update && apt-get install -y --no-install-recommends \
     # ADD YOUR PACKAGES HERE
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
 	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/*
 

diff --git a/javaForms/Dockerfile b/javaForms/Dockerfile
@@ -41,8 +41,8 @@ RUN apt-get -q -y update && \
     msopenjdk-21 \
     # ADD YOUR PACKAGES HERE
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
-    # __torizon_packages_dev_start__
-    # __torizon_packages_dev_end__
+    # __torizon_packages_build_start__
+    # __torizon_packages_build_end__
 # DO NOT REMOVE THIS LABEL: this is used for VS Code automation
     && \
     apt-get clean && apt-get autoremove && \