Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
os: ubuntu
runs_on: ['ubuntu-latest']
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
tools_install_dir: ~/miniforge3
build_workspace_dir: build_artifacts
docker_run_args:
steps:

- name: Checkout code
Expand All @@ -37,11 +40,13 @@ jobs:
id: build-linux
if: matrix.os == 'ubuntu'
env:
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
DOCKER_IMAGE: ${{ matrix.DOCKER_IMAGE }}
CI: github_actions
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.CONDA_FORGE_DOCKER_RUN_ARGS }}"
CONDA_FORGE_DOCKER_RUN_ARGS: "${{ matrix.docker_run_args }}"
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
FEEDSTOCK_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
STAGING_BINSTAR_TOKEN: ${{ secrets.STAGING_BINSTAR_TOKEN }}
Expand All @@ -61,13 +66,17 @@ jobs:
else
export IS_PR_BUILD="False"
fi
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
echo "::endgroup::"
./.scripts/run_docker_build.sh
- name: Build on macOS
id: build-macos
if: matrix.os == 'macos'
env:
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
CI: github_actions
Expand All @@ -86,6 +95,8 @@ jobs:
else
export IS_PR_BUILD="False"
fi
export MINIFORGE_HOME="${MINIFORGE_HOME/#~/${HOME}}"
export CONDA_BLD_PATH="${CONDA_BLD_PATH/#~/${HOME}}"
./.scripts/run_osx_build.sh
- name: Build on windows
Expand All @@ -98,10 +109,8 @@ jobs:
set "sha=%GITHUB_SHA%"
call ".scripts\run_win_build.bat"
env:
# default value; make it explicit, as it needs to match with artefact
# generation below. Not configurable for now, can be revisited later
CONDA_BLD_PATH: C:\bld
MINIFORGE_HOME: ${{ contains(runner.arch, 'ARM') && 'C' || 'D' }}:\Miniforge
MINIFORGE_HOME: ${{ matrix.tools_install_dir }}
CONDA_BLD_PATH: ${{ matrix.build_workspace_dir }}
PYTHONUNBUFFERED: 1
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
Expand Down
1 change: 1 addition & 0 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "ispyb" %}
{% set version = "12.0.0" %}
{% set version = "12.1.0" %}
{% set python_min = "3.10" %}

package:
Expand All @@ -8,7 +8,7 @@ package:

source:
url: https://pypi.org/packages/source/{{ name[0] }}/{{ name }}/ispyb-{{ version }}.tar.gz
sha256: 64f6e1ef0e0c37d51bd2baa500cb13fe519220192f0e2005582406696e68ea2c
sha256: 56c5272c7de46cf4e6404212810f2932d2b76643f5ba7fa5eb7a458efb489b79

build:
number: 0
Expand Down