From 94827a7a60853963e88e21d48375f6fe3735199c Mon Sep 17 00:00:00 2001 From: Christopher Woods Date: Sun, 2 Jun 2024 19:41:22 +0100 Subject: [PATCH] Does this work? --- .github/workflows/choose_branch.yaml | 8 +++----- .github/workflows/devel.yaml | 2 +- .github/workflows/main.yaml | 2 +- .github/workflows/pr.yaml | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/choose_branch.yaml b/.github/workflows/choose_branch.yaml index 534742c71..41541f42d 100644 --- a/.github/workflows/choose_branch.yaml +++ b/.github/workflows/choose_branch.yaml @@ -55,14 +55,12 @@ jobs: python-version: ${{ matrix.python-version }} activate-environment: sire_build miniforge-version: latest - miniforge-variant: Mambaforge - use-mamba: true # - name: Clone the desired branch run: git clone https://github.com/${{ env.REPO }} -b ${{ github.event.inputs.branch }} sire # - name: Setup Conda - run: mamba install -y -c conda-forge boa anaconda-client packaging pip-requirements-parser + run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser # - name: Update Conda recipe run: python ${{ github.workspace }}/sire/actions/update_recipe.py @@ -70,8 +68,8 @@ jobs: - name: Prepare build location run: mkdir ${{ github.workspace }}/build # - - name: Build Conda package using mamba build - run: conda mambabuild -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire + - name: Build Conda package using conda build + run: conda build -c conda-forge -c openbiosim/label/dev ${{ github.workspace }}/sire/recipes/sire # - name: Upload Conda package # Maybe add the logic here that this is a dev package? diff --git a/.github/workflows/devel.yaml b/.github/workflows/devel.yaml index 7c603c15a..9f623d3e2 100644 --- a/.github/workflows/devel.yaml +++ b/.github/workflows/devel.yaml @@ -55,7 +55,7 @@ jobs: run: git clone https://github.com/${{ env.REPO }} sire # - name: Setup Conda - run: conda install -y -c conda-forge conda-build anaconda-client packaging pip-requirements-parser + run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser # - name: Update Conda recipe run: python ${{ github.workspace }}/sire/actions/update_recipe.py diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ee70f5118..0b2c9ad5e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -55,7 +55,7 @@ jobs: run: git clone -b main https://github.com/openbiosim/sire sire # - name: Setup Conda - run: conda install -y -c conda-forge conda-build anaconda-client packaging pip-requirements-parser + run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser # - name: Update Conda recipe run: python ${{ github.workspace }}/sire/actions/update_recipe.py diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5840e5009..a49c5cc71 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -57,7 +57,7 @@ jobs: run: git clone -b ${{ github.head_ref }} --single-branch https://github.com/${{ env.REPO }} sire # - name: Setup Conda - run: conda install -y -c conda-forge conda-build anaconda-client packaging pip-requirements-parser + run: conda install -y -c conda-forge conda-build boa anaconda-client packaging pip-requirements-parser # - name: Update Conda recipe run: python ${{ github.workspace }}/sire/actions/update_recipe.py