Skip to content

Commit

Permalink
Merge pull request #4064 from boegel/ci_ubuntu-20.04
Browse files Browse the repository at this point in the history
update CI workflows (except container tests) to use Ubuntu 20.04, since Ubuntu 18.04 is deprecated
  • Loading branch information
branfosj authored Sep 8, 2022
2 parents b6daaac + 264b31f commit ceacc04
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/bootstrap_script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: test EasyBuild bootstrap script
on: [push, pull_request]
jobs:
setup:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
lmod7: Lmod-7.8.22
lmod8: Lmod-8.7.6
Expand All @@ -14,7 +14,7 @@ jobs:
- run: "true"
build:
needs: setup
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
# Don't run for Python 3.8, 3.9 , people should just use `pip install easybuild`
Expand Down Expand Up @@ -64,11 +64,11 @@ jobs:

- name: install OS & Python packages
run: |
# disable apt-get update, we don't really need it,
# disable apt update, we don't really need it,
# and it does more harm than good (it's fairly expensive, and it results in flaky test runs)
# sudo apt-get update
# sudo apt update
# for modules tool
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/container_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tests for container support
on: [push, pull_request]
jobs:
build:
# stick to Ubuntu 18.04, where we can still easily install yum via 'apt-get install'
# stick to Ubuntu 18.04, where we can still easily install yum via 'apt install'
runs-on: ubuntu-18.04
strategy:
matrix:
Expand All @@ -21,12 +21,12 @@ jobs:
- name: install OS & Python packages
run: |
# ensure package list is up to date to avoid 404's for old packages
sudo apt-get update -yqq
sudo apt update -yqq
# for building Singularity images
sudo apt-get install rpm
sudo apt-get install yum
sudo apt install rpm
sudo apt install yum
# for modules tool
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
Expand All @@ -49,7 +49,7 @@ jobs:
- name: install Singularity
run: |
# install alien, which can be used to convert RPMs to Debian packages
sudo apt-get install alien
sudo apt install alien
alien --version
# determine latest version of Singularity available in EPEL, and download RPM
singularity_rpm=$(curl -sL https://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/Packages/s/ | grep singularity | sed 's/.*singularity/singularity/g' | sed 's/rpm.*/rpm/g')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/eb_command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Tests for the 'eb' command
on: [push, pull_request]
jobs:
test-eb:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
Expand All @@ -25,7 +25,7 @@ jobs:
pip install --upgrade pip
pip --version
# install packages required for modules tool
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Static Analysis
on: [push, pull_request]
jobs:
python-linting:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: EasyBuild framework unit tests
on: [push, pull_request]
jobs:
setup:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
outputs:
lmod7: Lmod-7.8.22
lmod8: Lmod-8.7.6
Expand All @@ -14,7 +14,7 @@ jobs:
- run: "true"
build:
needs: setup
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
python: [2.7, 3.6]
Expand Down Expand Up @@ -86,20 +86,20 @@ jobs:

- name: install OS & Python packages
run: |
# disable apt-get update, we don't really need it,
# disable apt update, we don't really need it,
# and it does more harm than good (it's fairly expensive, and it results in flaky test runs)
# sudo apt-get update
# sudo apt update
# for modules tool
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
sudo ln -s /usr/lib/x86_64-linux-gnu/lua/5.2/posix_c.so /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so
fi
# for GitPython, python-hglib
sudo apt-get install git mercurial
sudo apt install git mercurial
# dep for GC3Pie
sudo apt-get install time
sudo apt install time
# Python packages
pip --version
pip install --upgrade pip
Expand Down

0 comments on commit ceacc04

Please sign in to comment.