From bfb54e0aa5964fa02145ee0b445c83a16bfc47d5 Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:16:11 -0600 Subject: [PATCH 1/6] Add check before publishing pip packages --- .github/workflows/pip.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pip.yaml b/.github/workflows/pip.yaml index 265523e9..175426da 100644 --- a/.github/workflows/pip.yaml +++ b/.github/workflows/pip.yaml @@ -1,7 +1,9 @@ +# https://github.com/pybind/scikit_build_example name: Wheels on: workflow_dispatch: + pull_request: release: types: - published @@ -78,7 +80,7 @@ jobs: name: Upload if release needs: [build_wheels, build_sdist] runs-on: ubuntu-latest - #if: github.event_name == 'release' && github.event.action == 'published' + if: (github.event_name == 'release' && github.event.action == 'published') || (github.ref_name == 'main') steps: - uses: actions/setup-python@v2 From d3025d5c5e513e478cf6c151c9559ba090255779 Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:23:42 -0600 Subject: [PATCH 2/6] add windows back to test matrix --- .github/workflows/run_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 99b6483e..f14c6360 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, macos-10.15] #, windows-latest] + os: [ubuntu-18.04, macos-10.15, windows-latest] python-version: [3.6, 3.7, 3.8, 3.9] steps: @@ -38,7 +38,7 @@ jobs: run: | conda install -c conda-forge "laz-perf>=3.0" Catch2 pybind11 --yes python -m pip install --upgrade pip - pip install pytest wheel + pip install pytest wheel ninja shell: bash -l {0} @@ -51,7 +51,7 @@ jobs: - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B "${{github.workspace}}/build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_TESTS_AND_EXAMPLES=ON -DWITH_PYTHON=OFF + run: cmake -G Ninja -B "${{github.workspace}}/build" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DWITH_TESTS_AND_EXAMPLES=ON -DWITH_PYTHON=OFF shell: bash -l {0} From 49f9cde31a80c4207fd2a50fbba32fa76239f836 Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:29:05 -0600 Subject: [PATCH 3/6] revert windows --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index f14c6360..34e79e6e 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-18.04, macos-10.15, windows-latest] + os: [ubuntu-18.04, macos-10.15] #, windows-latest] python-version: [3.6, 3.7, 3.8, 3.9] steps: From eb08a3b0a69fbfb1a3164e8be5e5715eb219d422 Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:31:17 -0600 Subject: [PATCH 4/6] verbose --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 34e79e6e..088fc859 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -44,7 +44,7 @@ jobs: - name: Build Copclib Python Bindings run: | - pip install . + pip install . -v shell: bash -l {0} From f7ec219d43058d3dc5a2fab80169b68a56911fca Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:33:29 -0600 Subject: [PATCH 5/6] set CMAKE_GENERATOR --- .github/workflows/run_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 088fc859..a744385c 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -9,6 +9,7 @@ on: env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) BUILD_TYPE: Release + CMAKE_GENERATOR: Ninja jobs: test: From aecca04c3f6948ae34c127e1b1b50e8dfd6f81ad Mon Sep 17 00:00:00 2001 From: Christopher Lee Date: Mon, 31 Jan 2022 10:35:31 -0600 Subject: [PATCH 6/6] test --- .github/workflows/run_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index a744385c..d0dd7baf 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -37,9 +37,9 @@ jobs: - name: Install dependencies run: | - conda install -c conda-forge "laz-perf>=3.0" Catch2 pybind11 --yes + conda install -c conda-forge "laz-perf>=3.0" Catch2 pybind11 ninja --yes python -m pip install --upgrade pip - pip install pytest wheel ninja + pip install pytest wheel shell: bash -l {0}