Skip to content

Commit

Permalink
revert to ubuntu 22.04 in actions, rename to miniforge in docker acti…
Browse files Browse the repository at this point in the history
…on and require setuptools (#446)

* revert to ubuntu 22.04

* rename mamabaforge to miniforge

* Update docker/web-app/install-mambaforge-and-env.sh

* Make setuptools a build requirement

* Update CHANGELOG.md
  • Loading branch information
lauramurgatroyd authored Jan 21, 2025
1 parent 076cfb9 commit b3c8cd4
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conda_build_and_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker_build_test_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## vx.x.x

Build and CI:
- Renamed mambaforge to miniforge to fix docker action #446
- Use ubuntu v22.04 in the actions #446
- Add setuptools as a build requirment #446

## v24.1.0

Enhancements:
Expand Down
1 change: 1 addition & 0 deletions Wrappers/Python/conda-recipe/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ dependencies:
- pyyaml
- schema
- cil-data=22.0.0
- setuptools
1 change: 1 addition & 0 deletions Wrappers/Python/conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ requirements:
build:
- python >=3.7
- vtk
- setuptools

run:
- python >=3.7
Expand Down
6 changes: 3 additions & 3 deletions docker/web-app/install-mambaforge-and-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null &&
INSTALL_DIR=$HOME/mambaforge

cd $HOME
curl -L -O https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh
bash $HOME/Mambaforge-Linux-x86_64.sh -b -p $INSTALL_DIR
rm $HOME/Mambaforge-Linux-x86_64.sh
curl -L -O "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
bash $HOME/Miniforge3-$(uname)-$(uname -m).sh -b -p $INSTALL_DIR
rm $HOME/Miniforge3-Linux-x86_64.sh
. $INSTALL_DIR/etc/profile.d/conda.sh
mamba env create -f $SCRIPT_DIR/environment.yml
conda activate cilviewer_webapp

0 comments on commit b3c8cd4

Please sign in to comment.