avoid cibw shlex mess on Linux config_settings

nitzmahone · May 17, 2024 · 7c641b0 · 7c641b0
1 parent f2ef602
commit 7c641b0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -200,8 +200,6 @@ jobs:
       matrix: ${{ fromJSON(needs.make_linux_pyyaml_matrix.outputs.matrix_json) }}
 
     steps:
-#    - name: Checkout PyYAML
-#      uses: actions/checkout@v4
     - name: fetch sdist artifact
       id: fetch_sdist
       uses: actions/download-artifact@v4
@@ -231,16 +229,24 @@ jobs:
           LD_LIBRARY_PATH=libyaml/src/.libs
           PYYAML_FORCE_CYTHON=1
           PYYAML_FORCE_LIBYAML=1
-        CIBW_CONFIG_SETTINGS: |
-          pyyaml_build_config={"force":1, "library_dirs": ["libyaml/src/.libs"], "include_dirs": ["libyaml/include"]}
         CIBW_TEST_COMMAND: cd {project}; pytest
         CIBW_TEST_REQUIRES: pytest
       run: |
         set -eux
         
         python3 -V
         python3 -m pip install -U --user ${{ matrix.cibw_version || 'cibuildwheel' }}
-        CIBW_BEFORE_BUILD="cp -r /host$(pwd)/libyaml {project} && ls -l {project}" python3 -m cibuildwheel --platform auto --output-dir ./dist ${{ steps.fetch_sdist.outputs.download-path }}/pyyaml*.tar.gz/pyyaml*.tar.gz
+        
+        mkdir pyyaml
+        
+        tar zxvf ${{ steps.fetch_sdist.outputs.download-path }}/pyyaml*.tar.gz/pyyaml*.tar.gz --strip-components=1 -C pyyaml
+        
+        cat << 'EOF' > build_config.toml
+        [tool.cibuildwheel.config-settings]
+        pyyaml_build_config='{"force":1, "library_dirs": ["libyaml/src/.libs"], "include_dirs": ["libyaml/include"]}'
+        EOF
+        
+        CIBW_BEFORE_BUILD="ls -l {project}" python3 -m cibuildwheel --config-file $(pwd)/build_config.toml --platform auto --output-dir ./dist ./pyyaml
 
         echo "artifact_name=$(ls ./dist/)" >> "$GITHUB_OUTPUT"
         # FIXME: ensure exactly one artifact