Refactor environment variables in GitHub workflows

The changes remove the explicit declaration of `CONAN_ARGS`, `ENTERPRISE`, and `STAGING` variables from the `env` sections of macOS, Linux, and Windows workflow files. Also, simplified the values of `enterprise` and `staging` parameters in job executions. These are now directly accessed from the GitHub action's input. Contribute to CURA-11440
Ultimaker · Dec 15, 2023 · 3c6c5f4 · 3c6c5f4
1 parent fb42fb6
commit 3c6c5f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 21 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -39,19 +39,14 @@ on:
         options:
           - ubuntu-22.04
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
   windows-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -43,19 +43,14 @@ on:
           - macos-11
           - macos-12
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
   windows-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -39,19 +39,14 @@ on:
         options:
           - windows-2022
 
-env:
-  CONAN_ARGS: ${{ inputs.conan_args || '' }}
-  ENTERPRISE: ${{ inputs.enterprise || false }}
-  STAGING: ${{ inputs.staging || false }}
-
 jobs:
   windows-installer:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
       conan_args: ${{ inputs.conan_args }}
-      enterprise: ${{ inputs.enterprise == 'true' }}
-      staging: ${{ inputs.staging == 'true' }}
+      enterprise: ${{ inputs.enterprise }}
+      staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
     secrets: inherit