From ddc1fb5e32cec0c23df8984a9db6043e3ea1de40 Mon Sep 17 00:00:00 2001 From: Bryn Pickering <17178478+brynpickering@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:33:43 +0000 Subject: [PATCH 1/2] Bump build number; update conda build config --- conda_build_config.yaml | 2 +- osmium/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_build_config.yaml b/conda_build_config.yaml index 1632c7d..8ffa9c9 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -663,10 +663,10 @@ pybind11_abi: - 4 python: # part of a zip_keys: python, python_impl, numpy - - 3.8.* *_cpython - 3.9.* *_cpython - 3.10.* *_cpython - 3.11.* *_cpython + - 3.12.* *_cpython python_impl: # part of a zip_keys: python, python_impl, numpy - cpython diff --git a/osmium/meta.yaml b/osmium/meta.yaml index 79c718c..03fb563 100644 --- a/osmium/meta.yaml +++ b/osmium/meta.yaml @@ -11,7 +11,7 @@ source: build: script: {{ PYTHON }} -m pip install --no-deps . -vv - number: 2 + number: 3 requirements: build: From 41a29bccce960916459d585ce781ee33b2095b37 Mon Sep 17 00:00:00 2001 From: Bryn Pickering <17178478+brynpickering@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:35:24 +0000 Subject: [PATCH 2/2] Fix reusable workflow ref --- .github/workflows/conda-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 931afeb..17c6613 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -47,7 +47,7 @@ jobs: if: needs.find-out-changes.outputs.matrix != '' strategy: matrix: ${{ fromJson(needs.find-out-changes.outputs.matrix) }} - uses: arup-group/actions-city-modelling-lab/.github/workflows/conda-build.yml@add-conda-build-args + uses: arup-group/actions-city-modelling-lab/.github/workflows/conda-build.yml@main secrets: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} with: @@ -60,7 +60,7 @@ jobs: if: github.ref == 'refs/heads/main' strategy: matrix: ${{ fromJson(needs.find-out-changes.outputs.matrix) }} - uses: arup-group/actions-city-modelling-lab/.github/workflows/conda-upload.yml@add-conda-build-args + uses: arup-group/actions-city-modelling-lab/.github/workflows/conda-upload.yml@main secrets: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} with: