Skip to content

Commit

Permalink
Merge pull request #35 from Fluorescence-Tools/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
tpeulen authored Feb 11, 2024
2 parents b0b1bfb + 2d2b9a6 commit 5ce5f6b
Show file tree
Hide file tree
Showing 17 changed files with 2,631 additions and 21 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
push:
branches:
- development # You can change this to the branch you want to trigger on
schedule:
# Every Monday at 17PM UTC (9AM EST)
- cron: "0 17 * * 1"

jobs:
build-linux:
Expand Down Expand Up @@ -36,6 +39,10 @@ jobs:
conda config --show
printenv | sort
- name: "Set SDK on MacOS (if needed)"
if: startsWith(matrix.os, 'macos')
run: tools/install_macos_sdk.sh

- name: Build Conda Package
shell: bash -el {0}
run: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/conda-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,16 @@ jobs:
conda config --show
printenv | sort
- name: "Set SDK on MacOS (if needed)"
if: startsWith(matrix.os, 'macos')
run: tools/install_macos_sdk.sh

- name: Build Conda Package
shell: bash -el {0}
run: |
mamba install conda-build boa anaconda-client
cd conda-recipe
# Use older conda_build_config -> boost-cpp 1.78
curl -sLO https://raw.githubusercontent.com/conda-forge/conda-forge-pinning-feedstock/084b098a28a7a66e9a0967d156bc55b9ebfc6726/recipe/conda_build_config.yaml
# curl -sLO https://github.com/conda-forge/conda-forge-pinning-feedstock/raw/main/recipe/conda_build_config.yaml
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ __pycache__
.vscode/
tttr-data
.idea/
tools/
leftovers/

# Documentation and tools
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

Loading

0 comments on commit 5ce5f6b

Please sign in to comment.