fix env vars 01

Author: hebasto

.github/workflows/ci.yml

@@ -57,11 +57,21 @@ jobs:
 
   mingw_debian:
     name: ${{ matrix.configuration.job_name }}
+    needs: docker_wine_cache
+    strategy:
+      fail-fast: false
+      matrix:
+        configuration:
+          - job_name: 'x86_64 (mingw32-w64): Windows (Debian stable, Wine)'
+            env_vars: 'HOST=x86_64-w64-mingw32'
+          - job_name: 'i686 (mingw32-w64): Windows (Debian stable, Wine)'
+            env_vars: 'HOST=i686-w64-mingw32'
     uses: ./.github/workflows/run-in-docker.yml
     with:
       dockerfile: ./ci/linux-debian-wine.Dockerfile
       tag: ci-image
-    needs: docker_wine_cache
+      job_env_vars: 'WRAPPER_CMD=wine WITH_VALGRIND=no ECDH=yes RECOVERY=yes SCHNORRSIG=yes CTIMETESTS=no'
+      matrix_env_vars: ${{ matrix.configuration.env_vars }}
 
     # env:
     #   WRAPPER_CMD: 'wine'
@@ -71,14 +81,6 @@ jobs:
     #   SCHNORRSIG: 'yes'
     #   CTIMETESTS: 'no'
 
-    strategy:
-      fail-fast: false
-      matrix:
-        configuration:
-          - job_name: 'x86_64 (mingw32-w64): Windows (Debian stable, Wine)'
-            env_vars: 'HOST=x86_64-w64-mingw32'
-          - job_name: 'i686 (mingw32-w64): Windows (Debian stable, Wine)'
-            env_vars: 'HOST=i686-w64-mingw32'
 
     # steps:
     #   - name: Checkout

.github/workflows/run-in-docker.yml

@@ -10,6 +10,14 @@ on:
         default: 'ci-image'
         required: false
         type: string
+      job_env_vars:
+        description: 'Environment variables provided by a job'
+        required: false
+        type: string
+      matrix_env_vars:
+        description: 'Environment variables provided by a matrix'
+        required: false
+        type: string
 
 jobs:
   reusable_workflow_job:
@@ -20,7 +28,7 @@ jobs:
 
       - name: Set environment variables
         run: |
-          read -r -a vars <<< "${{ matrix.configuration.env_vars }}"
+          read -r -a vars <<< "${{ inputs.job_env_vars }} ${{ inputs.matrix_env_vars }}"
           for var in "${vars[@]}"; do
             echo "$var" >> "$GITHUB_ENV"
           done