TEST

andreriesco · Jul 12, 2024 · c8a25bc · c8a25bc
1 parent 2538b41
commit c8a25bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml
@@ -16,7 +16,6 @@ jobs:
           - folder: python3Console
             container: python3-console
             arch: arm64
-            torizon_arch: aarch64
 
 
     steps:
@@ -29,10 +28,13 @@ jobs:
           PROJECT_CONTAINER: ${{ matrix.project.container }}
           PROJECT_ARCH: ${{ matrix.project.arch }}
           DOCKER_LOGIN: localhost:5002
-          "config:torizon_arch": ${{ matrix.project.torizon_arch }}
 
         run: |
           docker run --rm --privileged torizon/binfmt
+          if ($env:PROJECT_ARCH -eq "arm64") { $env:TORIZON_ARCH = "aarch64" }
+          if ($env:PROJECT_ARCH -eq "armhf") { $env:TORIZON_ARCH = "armhf" }
+          echo "TORIZON_ARCH=$env:TORIZON_ARCH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
           scripts/createFromTemplate.ps1 `
             $env:GITHUB_WORKSPACE/$env:PROJECT_FOLDER `

diff --git a/assets/tasks/common.json b/assets/tasks/common.json
@@ -478,10 +478,12 @@
                 "showReuseMessage": true,
                 "clear": false
             },
+            "env": {
+                "TORIZON_ARCH": "${config:torizon_arch}"
+            },
             "args": [
                 "-nop",
-                "${workspaceFolder}/.conf/torizonPackages.ps1",
-                "${config:torizon_arch}"
+                "${workspaceFolder}/.conf/torizonPackages.ps1"
             ],
             "dependsOrder": "sequence",
             "icon": {

diff --git a/scripts/torizonPackages.ps1 b/scripts/torizonPackages.ps1
@@ -16,7 +16,7 @@
 )]
 param()
 
-$TORIZON_ARCH = $args[0]
+$TORIZON_ARCH = $env:TORIZON_ARCH
 
 if ($TORIZON_ARCH -eq "aarch64") {
     $TORIZON_ARCH = "arm64"