From 3f566028c076c271865b00d060bd311690a207fe Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:12:29 +0200 Subject: debug pip packaging --- .github/workflows/pip-packaging-windows.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1cadf6b1..32abd0d2 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,8 +1,13 @@ name: pip packaging windows +#on: +# release: +# types: [published] + on: - release: - types: [published] + push: + branches: + - '*' jobs: build: @@ -22,7 +27,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine - name: Build python wheel @@ -35,8 +40,8 @@ jobs: cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/ cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/ python setup.py bdist_wheel - - name: Publish on PyPi - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: python -m twine upload build/src/python/dist/* +# - name: Publish on PyPi +# env: +# TWINE_USERNAME: __token__ +# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} +# run: python -m twine upload build/src/python/dist/* -- cgit v1.2.3 From 361c2279c176b16aa0d8c8268235c256e26ee88a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:14:27 +0200 Subject: debug pip packaging --- .github/workflows/pip-packaging-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 32abd0d2..438108e8 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -8,6 +8,8 @@ on: push: branches: - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From 55aa64c8a0ebd3eeb3a2a53048151ff02d0e1a45 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:21:10 +0200 Subject: on push or PR --- .github/workflows/pip-packaging-windows.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 438108e8..cf6aa809 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -4,12 +4,11 @@ name: pip packaging windows # release: # types: [published] -on: - push: - branches: - - '*' - - '*/*' - - '**' +on: [push, pull_request] + branches: + - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From 769d16af0822a4afd0f5cf3e17ea93e254ee5129 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:32:31 +0200 Subject: on push or PR --- .github/workflows/pip-packaging-windows.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index cf6aa809..ab913b7c 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -4,11 +4,18 @@ name: pip packaging windows # release: # types: [published] -on: [push, pull_request] - branches: - - '*' - - '*/*' - - '**' +on: + push: + branches: + - '*' + - '*/*' + - '**' +on: + pull_request: + branches: + - '*' + - '*/*' + - '**' jobs: build: -- cgit v1.2.3 From b47caf9b21755f4327495a22c4ad2cd473dfc2a6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:34:46 +0200 Subject: list boost packages --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ab913b7c..1e890ab6 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -41,6 +41,7 @@ jobs: - name: Build python wheel run: | python --version + vcpkg search boost mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 1af9341fc366e95dd8c2d6af4e1f9121dcf30066 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:36:37 +0200 Subject: not valid yml --- .github/workflows/pip-packaging-windows.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1e890ab6..9125b85c 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -10,12 +10,6 @@ on: - '*' - '*/*' - '**' -on: - pull_request: - branches: - - '*' - - '*/*' - - '**' jobs: build: -- cgit v1.2.3 From 160e4ca1da07ed4654e30ada31161d65689ec8a6 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:47:24 +0200 Subject: set some cmake variables --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 9125b85c..29622945 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -38,7 +38,7 @@ jobs: vcpkg search boost mkdir build cd build - cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DPython_ADDITIONAL_VERSIONS=3 .. + cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. cd src/python cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/ cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/ -- cgit v1.2.3 From 4eac68dbdf2c5d2c1a0accd4bdc0d78b502e58e9 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 14:59:19 +0200 Subject: boost-test for boost-unit-test-framework --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 29622945..fb98c045 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,7 +29,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine - name: Build python wheel -- cgit v1.2.3 From fa8dd069b58d79c39b5be78cfcf411af118a3a59 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:12:08 +0200 Subject: vcpkg list not search --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index fb98c045..1f40a476 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -35,7 +35,7 @@ jobs: - name: Build python wheel run: | python --version - vcpkg search boost + vcpkg list mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 592b268e4afee402afdead534217668f40cd23bb Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:26:42 +0200 Subject: lost some packages --- .github/workflows/pip-packaging-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 1f40a476..9bc0b28f 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -30,12 +30,15 @@ jobs: - name: Install dependencies run: | vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine + python -m pip list - name: Build python wheel run: | python --version vcpkg list + python -m pip list mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 25c4f713ce91e100d7abfe4bbba9f5159e39e6e1 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:42:19 +0200 Subject: try to cache vcpkg install --- .github/workflows/pip-packaging-windows.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 9bc0b28f..268e7ac4 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -23,21 +23,29 @@ jobs: - uses: actions/checkout@v1 with: submodules: true + # Restore from cache the previously built ports. If cache-miss, download, build vcpkg. + - name: Restore from cache and install vcpkg + # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. + uses: lukka/run-vcpkg@v3 + with: + setupOnly: true + # Now that vcpkg is installed, it is being used to run desired arguments. + - run: | + $VCPKG_ROOT/vcpkg @$vcpkgResponseFile + $VCPKG_ROOT/vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + shell: bash - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows - vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list - name: Build python wheel run: | python --version - vcpkg list python -m pip list mkdir build cd build -- cgit v1.2.3 From 800cd2a653c1ce7a7b8b40b3d856147641922013 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 15:54:58 +0200 Subject: All in one --- .github/workflows/pip-packaging-windows.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 268e7ac4..dabfceed 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -23,30 +23,17 @@ jobs: - uses: actions/checkout@v1 with: submodules: true - # Restore from cache the previously built ports. If cache-miss, download, build vcpkg. - - name: Restore from cache and install vcpkg - # Download and build vcpkg, without installing any port. If content is cached already, it is a no-op. - uses: lukka/run-vcpkg@v3 - with: - setupOnly: true - # Now that vcpkg is installed, it is being used to run desired arguments. - - run: | - $VCPKG_ROOT/vcpkg @$vcpkgResponseFile - $VCPKG_ROOT/vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows - shell: bash - uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} architecture: x64 - name: Install dependencies run: | + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list - - name: Build python wheel - run: | - python --version - python -m pip list mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From 17dd2957420cdf0c0fb4ffcaf046cac1dd8ab41c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 4 Aug 2020 16:17:34 +0200 Subject: No boost tests --- .github/workflows/pip-packaging-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index dabfceed..eec7b1a9 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,7 +29,7 @@ jobs: architecture: x64 - name: Install dependencies run: | - vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-test boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows + vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine -- cgit v1.2.3 From 6d07bf0baea26cf9c289ac078f70ec22f6c68ce7 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 07:18:35 +0200 Subject: vcpkg update as bzip2 fails --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index eec7b1a9..0ed6edb2 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -29,6 +29,7 @@ jobs: architecture: x64 - name: Install dependencies run: | + vcpkg update vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows vcpkg list python -m pip install --user -r .github/build-requirements.txt -- cgit v1.2.3 From 148b128fe955b57b606ffd0ee87c201d8371d143 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 07:32:08 +0200 Subject: vcpkg upgrade --- .github/workflows/pip-packaging-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 0ed6edb2..14bf2ab7 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -30,6 +30,7 @@ jobs: - name: Install dependencies run: | vcpkg update + vcpkg upgrade --no-dry-run vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows vcpkg list python -m pip install --user -r .github/build-requirements.txt -- cgit v1.2.3 From 39a79031a1c98100d92afd584b4a0a783846355e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Wed, 5 Aug 2020 09:26:04 +0200 Subject: Try a patch fix --- .github/workflows/pip-packaging-windows.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 14bf2ab7..0217f4fd 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -27,8 +27,14 @@ jobs: with: python-version: ${{ matrix.python-version }} architecture: x64 + - name: Patch + run: | + (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') + (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') + shell: powershell - name: Install dependencies run: | + deltree "c:\vcpkg\downloads\tools\msys2" vcpkg update vcpkg upgrade --no-dry-run vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows -- cgit v1.2.3 From f1c0e4624994113be3fd2b5d1c80b45d8a62087a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 07:34:00 +0200 Subject: Try w/o deltree --- .github/workflows/pip-packaging-windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 0217f4fd..ae35ee30 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -32,13 +32,12 @@ jobs: (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') shell: powershell - - name: Install dependencies +# deltree "c:\vcpkg\downloads\tools\msys2" + - name: Install dependencies run: | - deltree "c:\vcpkg\downloads\tools\msys2" vcpkg update vcpkg upgrade --no-dry-run vcpkg install boost-graph boost-serialization boost-date-time boost-system boost-filesystem boost-units boost-thread boost-program-options eigen3 mpfr mpir cgal --triplet x64-windows - vcpkg list python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list -- cgit v1.2.3 From d8121fe25816a25f4aacbd3d6a048c7d1e38e28c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 07:42:39 +0200 Subject: syntax error --- .github/workflows/pip-packaging-windows.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index ae35ee30..bba94712 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -32,8 +32,7 @@ jobs: (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978792/vcpkg_fixup_pkgconfig.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_fixup_pkgconfig.cmake') (new-object System.Net.WebClient).DownloadFile('https://github.com/microsoft/vcpkg/files/4978796/vcpkg_acquire_msys.cmake.txt','c:\vcpkg\scripts\cmake\vcpkg_acquire_msys.cmake') shell: powershell -# deltree "c:\vcpkg\downloads\tools\msys2" - - name: Install dependencies + - name: Install dependencies run: | vcpkg update vcpkg upgrade --no-dry-run -- cgit v1.2.3 From 2475e9ec590ae36d8b5f76216f6575c371b76165 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 08:21:00 +0200 Subject: Is it still ok ? --- .github/workflows/pip-packaging-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index bba94712..2d1058fe 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -40,6 +40,8 @@ jobs: python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list + - name: Build wheels + run: | mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DGMP_INCLUDE_DIR="c:/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/vcpkg/installed/x64-windows/lib" -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows -DPython_ADDITIONAL_VERSIONS=3 .. -- cgit v1.2.3 From a73448292bf41a6af928f649905e2ceeca199c24 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Mon, 10 Aug 2020 08:53:42 +0200 Subject: Some cleanups before the merge --- .github/workflows/pip-packaging-windows.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pip-packaging-windows.yml b/.github/workflows/pip-packaging-windows.yml index 2d1058fe..2e45ad71 100644 --- a/.github/workflows/pip-packaging-windows.yml +++ b/.github/workflows/pip-packaging-windows.yml @@ -1,15 +1,8 @@ name: pip packaging windows -#on: -# release: -# types: [published] - -on: - push: - branches: - - '*' - - '*/*' - - '**' +on: + release: + types: [published] jobs: build: @@ -40,7 +33,7 @@ jobs: python -m pip install --user -r .github/build-requirements.txt python -m pip install --user twine python -m pip list - - name: Build wheels + - name: Build python wheel run: | mkdir build cd build @@ -49,8 +42,8 @@ jobs: cp c:/vcpkg/installed/x64-windows/bin/mpfr.dll gudhi/ cp c:/vcpkg/installed/x64-windows/bin/mpir.dll gudhi/ python setup.py bdist_wheel -# - name: Publish on PyPi -# env: -# TWINE_USERNAME: __token__ -# TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} -# run: python -m twine upload build/src/python/dist/* + - name: Publish on PyPi + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: python -m twine upload build/src/python/dist/* -- cgit v1.2.3