Skip to content

Commit 31f5367

Browse files
authored
Merge pull request #4358 from boegel/ci_5.0.x
use 5.0.x branch for easyblocks + easyconfigs in CI workflows (for now)
2 parents 5ae74c9 + 62b4c16 commit 31f5367

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

.github/workflows/container_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
ls dist
7575
export PREFIX=/tmp/$USER/$GITHUB_SHA
7676
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
77-
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/develop.tar.gz
77+
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/5.0.x.tar.gz
7878
7979
- name: run test
8080
run: |
@@ -95,7 +95,7 @@ jobs:
9595
echo '%_dbpath %{_var}/lib/rpm' >> $HOME/.rpmmacros
9696
# build CentOS 7 container image for bzip2 1.0.8 using EasyBuild;
9797
# see https://docs.easybuild.io/en/latest/Containers.html
98-
curl -OL https://raw.githubusercontent.com/easybuilders/easybuild-easyconfigs/develop/easybuild/easyconfigs/b/bzip2/bzip2-1.0.8.eb
98+
curl -OL https://raw.githubusercontent.com/easybuilders/easybuild-easyconfigs/5.0.x/easybuild/easyconfigs/b/bzip2/bzip2-1.0.8.eb
9999
export EASYBUILD_CONTAINERPATH=$PWD
100100
export EASYBUILD_CONTAINER_CONFIG='bootstrap=docker,from=ghcr.io/easybuilders/centos-7.9-python3-amd64'
101101
eb bzip2-1.0.8.eb --containerize --experimental --container-build-image

.github/workflows/container_tests_apptainer.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
ls dist
6767
export PREFIX=/tmp/$USER/$GITHUB_SHA
6868
pip install --prefix $PREFIX dist/easybuild-framework*tar.gz
69-
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/develop.tar.gz
69+
pip install --prefix $PREFIX https://github.com/easybuilders/easybuild-easyblocks/archive/5.0.x.tar.gz
7070
7171
- name: run test
7272
run: |
@@ -87,7 +87,7 @@ jobs:
8787
echo '%_dbpath %{_var}/lib/rpm' >> $HOME/.rpmmacros
8888
# build CentOS 7 container image for bzip2 1.0.8 using EasyBuild;
8989
# see https://docs.easybuild.io/en/latest/Containers.html
90-
curl -OL https://raw.githubusercontent.com/easybuilders/easybuild-easyconfigs/develop/easybuild/easyconfigs/b/bzip2/bzip2-1.0.8.eb
90+
curl -OL https://raw.githubusercontent.com/easybuilders/easybuild-easyconfigs/5.0.x/easybuild/easyconfigs/b/bzip2/bzip2-1.0.8.eb
9191
export EASYBUILD_CONTAINERPATH=$PWD
9292
export EASYBUILD_CONTAINER_CONFIG='bootstrap=docker,from=ghcr.io/easybuilders/centos-7.9-python3-amd64'
9393
export EASYBUILD_CONTAINER_TYPE='apptainer'

.github/workflows/end2end.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525
run: |
2626
cd $HOME
2727
for pkg in easyblocks easyconfigs; do
28-
curl -OL https://github.com/easybuilders/easybuild-${pkg}/archive/develop.tar.gz
29-
tar xfz develop.tar.gz
30-
rm -f develop.tar.gz
28+
curl -OL https://github.com/easybuilders/easybuild-${pkg}/archive/5.0.x.tar.gz
29+
tar xfz 5.0.x.tar.gz
30+
rm -f 5.0.x.tar.gz
3131
done
3232
3333
- name: Set up environment
3434
shell: bash
3535
run: |
3636
# collect environment variables to be set in subsequent steps in script that can be sourced
3737
echo "export PATH=$PWD:$PATH" > /tmp/eb_env
38-
echo "export PYTHONPATH=$PWD:$HOME/easybuild-easyblocks-develop:$HOME/easybuild-easyconfigs-develop" >> /tmp/eb_env
38+
echo "export PYTHONPATH=$PWD:$HOME/easybuild-easyblocks-5.0.x:$HOME/easybuild-easyconfigs-5.0.x" >> /tmp/eb_env
3939
4040
- name: Run commands to check test environment
4141
shell: bash

0 commit comments

Comments
 (0)