From c8a25bc0fcb74cc68105dd95c72b20d0293ac98b Mon Sep 17 00:00:00 2001
From: Andre Riesco <andre.riesco@toradex.com>
Date: Fri, 12 Jul 2024 10:00:11 -0300
Subject: [PATCH] TEST

---
 .github/workflows/build-python.yaml | 6 ++++--
 assets/tasks/common.json            | 6 ++++--
 scripts/torizonPackages.ps1         | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-python.yaml b/.github/workflows/build-python.yaml
index 4c8fc48f7..a1a5795b0 100644
--- 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
index 38c5bfe96..7433aa76b 100644
--- 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
index 726cc125a..0075a35ba 100644
--- 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"