Skip to content

Commit ceacc04

Browse files
authored
Merge pull request #4064 from boegel/ci_ubuntu-20.04
update CI workflows (except container tests) to use Ubuntu 20.04, since Ubuntu 18.04 is deprecated
2 parents b6daaac + 264b31f commit ceacc04

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.github/workflows/bootstrap_script.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: test EasyBuild bootstrap script
33
on: [push, pull_request]
44
jobs:
55
setup:
6-
runs-on: ubuntu-latest
6+
runs-on: ubuntu-20.04
77
outputs:
88
lmod7: Lmod-7.8.22
99
lmod8: Lmod-8.7.6
@@ -14,7 +14,7 @@ jobs:
1414
- run: "true"
1515
build:
1616
needs: setup
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1818
strategy:
1919
matrix:
2020
# Don't run for Python 3.8, 3.9 , people should just use `pip install easybuild`
@@ -64,11 +64,11 @@ jobs:
6464

6565
- name: install OS & Python packages
6666
run: |
67-
# disable apt-get update, we don't really need it,
67+
# disable apt update, we don't really need it,
6868
# and it does more harm than good (it's fairly expensive, and it results in flaky test runs)
69-
# sudo apt-get update
69+
# sudo apt update
7070
# for modules tool
71-
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
71+
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
7272
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
7373
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
7474
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then

.github/workflows/container_tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Tests for container support
33
on: [push, pull_request]
44
jobs:
55
build:
6-
# stick to Ubuntu 18.04, where we can still easily install yum via 'apt-get install'
6+
# stick to Ubuntu 18.04, where we can still easily install yum via 'apt install'
77
runs-on: ubuntu-18.04
88
strategy:
99
matrix:
@@ -21,12 +21,12 @@ jobs:
2121
- name: install OS & Python packages
2222
run: |
2323
# ensure package list is up to date to avoid 404's for old packages
24-
sudo apt-get update -yqq
24+
sudo apt update -yqq
2525
# for building Singularity images
26-
sudo apt-get install rpm
27-
sudo apt-get install yum
26+
sudo apt install rpm
27+
sudo apt install yum
2828
# for modules tool
29-
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
29+
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
3030
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
3131
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
3232
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
@@ -49,7 +49,7 @@ jobs:
4949
- name: install Singularity
5050
run: |
5151
# install alien, which can be used to convert RPMs to Debian packages
52-
sudo apt-get install alien
52+
sudo apt install alien
5353
alien --version
5454
# determine latest version of Singularity available in EPEL, and download RPM
5555
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')

.github/workflows/eb_command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Tests for the 'eb' command
33
on: [push, pull_request]
44
jobs:
55
test-eb:
6-
runs-on: ubuntu-18.04
6+
runs-on: ubuntu-20.04
77
strategy:
88
matrix:
99
python: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
@@ -25,7 +25,7 @@ jobs:
2525
pip install --upgrade pip
2626
pip --version
2727
# install packages required for modules tool
28-
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
28+
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
2929
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
3030
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
3131
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then

.github/workflows/linting.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Static Analysis
22
on: [push, pull_request]
33
jobs:
44
python-linting:
5-
runs-on: ubuntu-18.04
5+
runs-on: ubuntu-20.04
66
strategy:
77
matrix:
88
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10']

.github/workflows/unit_tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: EasyBuild framework unit tests
33
on: [push, pull_request]
44
jobs:
55
setup:
6-
runs-on: ubuntu-latest
6+
runs-on: ubuntu-20.04
77
outputs:
88
lmod7: Lmod-7.8.22
99
lmod8: Lmod-8.7.6
@@ -14,7 +14,7 @@ jobs:
1414
- run: "true"
1515
build:
1616
needs: setup
17-
runs-on: ubuntu-18.04
17+
runs-on: ubuntu-20.04
1818
strategy:
1919
matrix:
2020
python: [2.7, 3.6]
@@ -86,20 +86,20 @@ jobs:
8686

8787
- name: install OS & Python packages
8888
run: |
89-
# disable apt-get update, we don't really need it,
89+
# disable apt update, we don't really need it,
9090
# and it does more harm than good (it's fairly expensive, and it results in flaky test runs)
91-
# sudo apt-get update
91+
# sudo apt update
9292
# for modules tool
93-
sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
93+
sudo apt install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev
9494
# fix for lua-posix packaging issue, see https://bugs.launchpad.net/ubuntu/+source/lua-posix/+bug/1752082
9595
# needed for Ubuntu 18.04, but not for Ubuntu 20.04, so skipping symlinking if posix.so already exists
9696
if [ ! -e /usr/lib/x86_64-linux-gnu/lua/5.2/posix.so ] ; then
9797
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
9898
fi
9999
# for GitPython, python-hglib
100-
sudo apt-get install git mercurial
100+
sudo apt install git mercurial
101101
# dep for GC3Pie
102-
sudo apt-get install time
102+
sudo apt install time
103103
# Python packages
104104
pip --version
105105
pip install --upgrade pip

0 commit comments

Comments
 (0)