Skip to content

Commit e18d333

Browse files
committed
fix window
1 parent c254e6b commit e18d333

File tree

1 file changed

+6
-36
lines changed

1 file changed

+6
-36
lines changed

.github/workflows/cross_platform_tests.yml

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,49 +73,19 @@ jobs:
7373
run: echo "$PWD/.venv/Scripts" >> $GITHUB_PATH
7474
shell: bash
7575

76-
# Install Windows-specific dependencies
77-
- name: Setup Windows OpenSSL
76+
# Attempt to install OpenSSL using Chocolatey for Windows if needed by the crate itself
77+
- name: Install OpenSSL (Windows only)
7878
if: matrix.os == 'windows-latest'
79-
run: |
80-
choco install openssl -y
81-
echo "OPENSSL_DIR=C:/Program Files/OpenSSL-Win64" >> $GITHUB_ENV
82-
echo "OPENSSL_STATIC=1" >> $GITHUB_ENV
83-
echo "OPENSSL_NO_VENDOR=1" >> $GITHUB_ENV
84-
shell: bash
85-
86-
- name: Install Perl modules on Windows
87-
if: matrix.os == 'windows-latest'
88-
run: |
89-
choco install strawberryperl -y
90-
cpan App::cpanminus
91-
cpanm --notest Locale::Maketext::Simple
92-
cpanm --notest Text::Template
93-
cpanm --notest Params::Check
94-
cpanm --notest IPC::Cmd
79+
run: choco install openssl -y --no-progress || echo "OpenSSL installation failed, continuing..."
9580
shell: bash
96-
97-
- name: Install dependencies for testing
98-
if: matrix.os != 'windows-latest'
99-
run: |
100-
python -m pip install --upgrade pip
101-
pip install pytest pytest-benchmark
102-
if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
103-
104-
- name: Install dependencies for testing (Windows)
105-
if: matrix.os == 'windows-latest'
81+
82+
- name: Install dependencies
10683
run: |
10784
python -m pip install --upgrade pip
10885
pip install pytest pytest-benchmark
109-
pip install statistics>=1.0.3.5
110-
# Try installing c2pa-python with best effort
111-
pip install c2pa-python || echo "c2pa-python installation failed, will proceed anyway"
86+
if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt || echo "Failed to install some dependencies from tests/requirements.txt, continuing..."; fi
11287
shell: bash
11388

114-
- name: Install c2pa-python for benchmarking
115-
if: matrix.os != 'windows-latest'
116-
run: pip install c2pa-python
117-
continue-on-error: true # Continue even if c2pa-python install fails
118-
11989
- name: Build and install package with maturin
12090
uses: PyO3/maturin-action@v1
12191
with:

0 commit comments

Comments
 (0)