From 88f754b911da6b48871f1ad9ff33247d2f8233c4 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 1 Aug 2024 16:45:18 +0530 Subject: [PATCH 1/7] Just re-run CI to show failure --- .github/workflows/ci_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 27d49f6c5..089bbfafb 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -57,6 +57,7 @@ jobs: - name: Install fypp run: pip install fypp + - run: >- PATH=$PATH:/mingw64/bin/ cmake -Wdev From 99d31af29edcc60f04eb1089075759907188cd79 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 1 Aug 2024 16:46:37 +0530 Subject: [PATCH 2/7] Install fypp from msys2 package --- .github/workflows/ci_windows.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 089bbfafb..167de1b13 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 @@ -50,14 +50,10 @@ jobs: mingw-w64-x86_64-gcc mingw-w64-x86_64-gcc-fortran python - python-pip + mingw-w64-x86_64-python-fypp cmake ninja - - name: Install fypp - run: pip install fypp - - - run: >- PATH=$PATH:/mingw64/bin/ cmake -Wdev From 6e7cd87f6ec44b6262acfa30ffcacde1f3003870 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 1 Aug 2024 16:53:02 +0530 Subject: [PATCH 3/7] Remove setuptools --- .github/workflows/ci_windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 167de1b13..3e4ea245b 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -35,7 +35,6 @@ jobs: mingw-w64-${{ matrix.arch }}-gcc-fortran mingw-w64-${{ matrix.arch }}-python mingw-w64-${{ matrix.arch }}-python-fypp - mingw-w64-${{ matrix.arch }}-python-setuptools mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja From 1fd326c0a61226decb17c9820ad8882900d2c72f Mon Sep 17 00:00:00 2001 From: minhqdao Date: Thu, 1 Aug 2024 16:54:12 +0530 Subject: [PATCH 4/7] Unify environment setup --- .github/workflows/ci_windows.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 3e4ea245b..811a625e8 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -23,9 +23,8 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup MinGW native environment + - name: Setup environment uses: msys2/setup-msys2@v2 - if: contains(matrix.msystem, 'MINGW') with: msystem: ${{ matrix.msystem }} update: false @@ -38,21 +37,6 @@ jobs: mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja - - name: Setup msys POSIX environment - uses: msys2/setup-msys2@v2 - if: contains(matrix.msystem, 'MSYS') - with: - msystem: MSYS - update: false - install: >- - git - mingw-w64-x86_64-gcc - mingw-w64-x86_64-gcc-fortran - python - mingw-w64-x86_64-python-fypp - cmake - ninja - - run: >- PATH=$PATH:/mingw64/bin/ cmake -Wdev From a5e9e38937bb82707c22ca5d35b70b2b21d3e9b6 Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 4 Aug 2024 15:18:22 +0530 Subject: [PATCH 5/7] Split setup again and but still install fypp as msys2 package on mingw --- .github/workflows/ci_windows.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 811a625e8..b45d26b2f 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -23,8 +23,9 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup environment + - name: Setup MinGW native environment uses: msys2/setup-msys2@v2 + if: contains(matrix.msystem, 'MINGW') with: msystem: ${{ matrix.msystem }} update: false @@ -36,6 +37,25 @@ jobs: mingw-w64-${{ matrix.arch }}-python-fypp mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja + + - name: Setup msys POSIX environment + uses: msys2/setup-msys2@v2 + if: contains(matrix.msystem, 'MSYS') + with: + msystem: MSYS + update: false + install: >- + git + mingw-w64-x86_64-gcc + mingw-w64-x86_64-gcc-fortran + python + python-pip + cmake + ninja + + - name: Install fypp + if: contains(matrix.msystem, 'MSYS') + run: pip install fypp - run: >- PATH=$PATH:/mingw64/bin/ cmake From c2a1b4bf92fac195671df0a303e37473b567af3d Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 4 Aug 2024 15:20:10 +0530 Subject: [PATCH 6/7] Remove whitespace --- .github/workflows/ci_windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index b45d26b2f..8d8b57372 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -37,7 +37,7 @@ jobs: mingw-w64-${{ matrix.arch }}-python-fypp mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja - + - name: Setup msys POSIX environment uses: msys2/setup-msys2@v2 if: contains(matrix.msystem, 'MSYS') @@ -52,7 +52,7 @@ jobs: python-pip cmake ninja - + - name: Install fypp if: contains(matrix.msystem, 'MSYS') run: pip install fypp From eabcae457d34c2c8d8ebaa9c729eb717736806ce Mon Sep 17 00:00:00 2001 From: minhqdao Date: Sun, 4 Aug 2024 15:25:05 +0530 Subject: [PATCH 7/7] Remove msys --- .github/workflows/ci_windows.yml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 8d8b57372..66551fdd2 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -13,7 +13,6 @@ jobs: fail-fast: false matrix: include: [ - { msystem: MSYS, arch: x86_64 }, { msystem: MINGW64, arch: x86_64 }, { msystem: MINGW32, arch: i686 } ] @@ -25,7 +24,6 @@ jobs: - name: Setup MinGW native environment uses: msys2/setup-msys2@v2 - if: contains(matrix.msystem, 'MINGW') with: msystem: ${{ matrix.msystem }} update: false @@ -38,25 +36,6 @@ jobs: mingw-w64-${{ matrix.arch }}-cmake mingw-w64-${{ matrix.arch }}-ninja - - name: Setup msys POSIX environment - uses: msys2/setup-msys2@v2 - if: contains(matrix.msystem, 'MSYS') - with: - msystem: MSYS - update: false - install: >- - git - mingw-w64-x86_64-gcc - mingw-w64-x86_64-gcc-fortran - python - python-pip - cmake - ninja - - - name: Install fypp - if: contains(matrix.msystem, 'MSYS') - run: pip install fypp - - run: >- PATH=$PATH:/mingw64/bin/ cmake -Wdev