Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert to ubuntu 22.04 in actions, rename to miniforge in docker action and require setuptools #446

Merged
merged 8 commits into from
Jan 21, 2025
Merged

revert to ubuntu 22.04 in actions, rename to miniforge in docker action and require setuptools #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba38763
revert to ubuntu 22.04
lauramurgatroyd Dec 18, 2024
fa0a7c3
Update docker_build_test_publish.yml
lauramurgatroyd Jan 8, 2025
5b194fa
rename mamabaforge to miniforge
lauramurgatroyd Jan 8, 2025
b9a7996
Update docker/web-app/install-mambaforge-and-env.sh
lauramurgatroyd Jan 9, 2025
ccf57d2
Require setuptools
lauramurgatroyd Jan 9, 2025
356a565
Update environment.yml
lauramurgatroyd Jan 9, 2025
0d0b938
Make setuptools a build requirement
lauramurgatroyd Jan 15, 2025
da01f7a
Update CHANGELOG.md
lauramurgatroyd Jan 15, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/conda_build_and_publish.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading