70 lines
1.9 KiB
Diff
70 lines
1.9 KiB
Diff
From 29bca6042fe8e66965c3c7207699fff107403296 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Sat, 3 Jul 2021 09:22:14 +0200
|
|
Subject: [PATCH 106/N] [squash] CI: use srcdir!=builddir
|
|
|
|
To catch me breaking it
|
|
---
|
|
.github/workflows/mingw.yml | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
|
|
index d45a9c2..b2f0d6a 100644
|
|
--- a/.github/workflows/mingw.yml
|
|
+++ b/.github/workflows/mingw.yml
|
|
@@ -87,8 +87,9 @@ jobs:
|
|
export CXXFLAGS
|
|
export CPPFLAGS
|
|
|
|
+ rm -Rf _build && mkdir _build && cd _build
|
|
|
|
- MSYSTEM=MINGW ./configure \
|
|
+ MSYSTEM=MINGW ../configure \
|
|
--prefix=${MINGW_PREFIX} \
|
|
--host=${MINGW_CHOST} \
|
|
--build=${MINGW_CHOST} \
|
|
@@ -117,8 +118,8 @@ jobs:
|
|
run: |
|
|
set -ex
|
|
|
|
+ cd _build
|
|
_pybasever=$(./python.exe -c "import sys; print(sys.winver);")
|
|
- srcdir=.
|
|
|
|
# now install things
|
|
|
|
@@ -171,6 +172,7 @@ jobs:
|
|
shell: msys2 {0}
|
|
run: |
|
|
SMOKETESTS="$(pwd)/.github/workflows/smoketests.py"
|
|
+ cd _build
|
|
cd python_pkgdir/${MINGW_PREFIX}/bin
|
|
./python.exe "$SMOKETESTS"
|
|
MSYSTEM= ./python.exe "$SMOKETESTS"
|
|
@@ -179,6 +181,7 @@ jobs:
|
|
continue-on-error: true
|
|
shell: msys2 {0}
|
|
run: |
|
|
+ cd _build
|
|
cd python_pkgdir/${MINGW_PREFIX}/bin
|
|
./python.exe -m test -j4
|
|
|
|
@@ -186,6 +189,7 @@ jobs:
|
|
if: always()
|
|
shell: msys2 {0}
|
|
run: |
|
|
+ cd _build
|
|
tar -I 'zstd --ultra -20' -cf python.tar.zst python_pkgdir/
|
|
|
|
- name: Upload
|
|
@@ -193,5 +197,5 @@ jobs:
|
|
if: always()
|
|
with:
|
|
name: build-${{ matrix.msystem }}
|
|
- path: python.tar.zst
|
|
+ path: _build/python.tar.zst
|
|
|
|
--
|
|
2.32.0
|
|
|