Skip to content

Commit

Permalink
Merge branch 'master' into rjoomen-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
Levi-Armstrong authored Jan 16, 2024
2 parents 1764334 + 9a6e2ef commit a265ab8
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
45 changes: 24 additions & 21 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ on:
jobs:
conda-win:
runs-on: windows-2019
defaults:
run:
shell: powershell
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -28,30 +31,31 @@ jobs:
- name: vcs import
run: >
vcs import --input "${{ github.workspace }}/workspace/src/tesseract/.github/workflows/windows_dependencies.repos" workspace/src/
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
channel-priority: true
channels: conda-forge
channel-priority: strict
environment-file: workspace/src/tesseract/.github/workflows/conda/environment.yml
use-mamba: true
- name: conda install
run: |
mamba activate test
mamba update --all -y
mamba install boa conda-smithy -y
auto-update-conda: true
activate-environment: tesseract-build
- name: build and test
run: |
mamba activate test
conda info
conda list
mkdir conda
xcopy /E workspace\src\tesseract\.github\workflows\conda conda
cd conda
New-Item -Name conda-forge.yml -ItemType File
conda smithy regenerate
mamba mambabuild -m .ci_support/win_64_.yaml .
conda mambabuild -m .ci_support/win_64_.yaml .
conda-linux:
runs-on: ubuntu-latest
defaults:
run:
shell: bash -el {0}
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -62,22 +66,21 @@ jobs:
- name: vcs import
run: >
vcs import --input "${{ github.workspace }}/workspace/src/tesseract/.github/workflows/windows_dependencies.repos" workspace/src/
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
miniforge-variant: Mambaforge
channel-priority: true
channels: conda-forge
python-version: "3.10"
channel-priority: strict
environment-file: workspace/src/tesseract/.github/workflows/conda/environment.yml
use-mamba: true
- name: conda install
run: |
mamba update --all -y
mamba install boa conda-smithy -y
auto-update-conda: true
activate-environment: tesseract-build
- name: build and test
run: |
conda info
conda list
cp -r workspace/src/tesseract/.github/workflows/conda ./conda
cd conda
touch conda-forge.yml
conda smithy regenerate
mamba mambabuild -m .ci_support/linux_64_.yaml .
conda mambabuild -m .ci_support/linux_64_.yaml .
6 changes: 6 additions & 0 deletions .github/workflows/conda/environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: tesseract-build
channels:
- conda-forge
dependencies:
- boa
- conda-smithy

0 comments on commit a265ab8

Please sign in to comment.