From e1aceca2a04862e522c4004d038babb68cf3ba7b Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 1 Aug 2024 16:33:20 +0530 Subject: [PATCH] Only use msys2 packages, remove pip --- .github/workflows/ci_windows.yml | 7 +------ fpm.toml | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index a9e056d10..6a3d8bac0 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -34,7 +34,7 @@ jobs: mingw-w64-${{ matrix.arch }}-gcc mingw-w64-${{ matrix.arch }}-gcc-fortran mingw-w64-${{ matrix.arch }}-python - mingw-w64-${{ matrix.arch }}-python-pip + mingw-w64-${{ matrix.arch }}-python-fypp mingw-w64-${{ matrix.arch }}-python-setuptools mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja @@ -51,16 +51,11 @@ jobs: mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-fortran python - python-pip mingw-w64-x86_64-python-fypp cmake ninja mingw-w64-x86_64-minizip-ng - - name: Install fypp (MinGW) - if: contains(matrix.msystem, 'MINGW') - run: pip install fypp - - run: >- PATH=$PATH:/mingw64/bin/ cmake -Wdev diff --git a/fpm.toml b/fpm.toml index ff11e5258..bf8dfc530 100644 --- a/fpm.toml +++ b/fpm.toml @@ -9,9 +9,6 @@ copyright = "2019-2021 stdlib contributors" test-drive.git = "https://github.com/fortran-lang/test-drive" test-drive.tag = "v0.4.0" -[build] -link = ["minizip-ng"] - [preprocess] [preprocess.cpp] suffixes = [".F90", ".f90"]