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.

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

[CI]: Upgrade Docker images and workflows #396

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ jobs:
run: |
echo "Using FSL : $(flirt -version)"
- name: Install system dependencies
# actions/checkout fails to identify Git as it's not in the CI image
run: |
# actions/checkout fails to identify Git as it's not in the CI image
apt-get -qq update && \
apt-get -qq install -y \
sudo apt-get update
sudo apt-get install -y \
git \
git-annex \
make \
jq
# Copy xfms directory
mkdir -p $HOME/junifer/data/xfms && \
- name: Copy xfms directory
mkdir -p $HOME/junifer/data/xfms
cp -ar /root/junifer/data/xfms/. $HOME/junifer/data/xfms/
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -59,8 +59,8 @@ jobs:
git config --global user.email "[email protected]"
git config --global user.name "GitHub Runner"
- name: Test with tox
# https://github.com/actions/checkout/issues/1169#issuecomment-2291682583
run: |
# https://github.com/actions/checkout/issues/1169#issuecomment-2291682583
git config --system --add safe.directory $(pwd)
tox
- name: Upload coverage to Codecov
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-ci-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-docs-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: read
packages: write
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ jobs:
run: |
echo "Using ANTs : $(antsRegistration --version)"
- name: Install system dependencies
# actions/checkout fails to identify Git as it's not in the CI image
run: |
# actions/checkout fails to identify Git as it's not in the CI image
apt-get -qq update && \
apt-get -qq install -y \
sudo apt-get update
sudo apt-get install -y \
git \
git-annex \
make \
jq
# Copy xfms directory
mkdir -p $HOME/junifer/data/xfms && \
- name: Copy xfms directory
mkdir -p $HOME/junifer/data/xfms
cp -ar /root/junifer/data/xfms/. $HOME/junifer/data/xfms/
- name: Checkout source
- name: Checkout repository
uses: actions/checkout@v4
with:
# require all of history to see all tagged versions' docs
Expand Down Expand Up @@ -59,8 +59,8 @@ jobs:
path: docs/_build
- name: Build docs
# Use the args we normally pass to sphinx-build, but run sphinx-multiversion
# https://github.com/actions/checkout/issues/1169#issuecomment-2291682583
run: |
# https://github.com/actions/checkout/issues/1169#issuecomment-2291682583
git config --system --add safe.directory $(pwd)
make -C docs/ html
touch docs/_build/.nojekyll
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile-ci
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ RUN apt-get update && \
file \
dc \
libquadmath0 \
libgomp1
libgomp1 \
&& rm -rf /var/lib/apt/lists/*

# Add xfms
COPY --from=ghcr.io/juaml/human-template-xfms:main /opt/xfms /root/junifer/data/xfms
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile-docs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ RUN apt-get update && \
apt-get install -y \
# ANTs runtime stuff
libhdf5-dev \
bc
bc \
&& rm -rf /var/lib/apt/lists/*

# Add xfms
COPY --from=ghcr.io/juaml/human-template-xfms:main /opt/xfms /root/junifer/data/xfms
Expand Down