Skip to content

Commit 8bbe253

Browse files
author
Daan Hoogland
committed
Merge release branch 4.20 to main
* 4.20: Update CI workflow to use Ubuntu 24.04 (#11873)
2 parents f63118c + a6068a8 commit 8bbe253

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929
jobs:
3030
build:
3131
if: github.repository == 'apache/cloudstack'
32-
runs-on: ubuntu-22.04
32+
runs-on: ubuntu-24.04
3333

3434
strategy:
3535
fail-fast: false
@@ -236,7 +236,7 @@ jobs:
236236
- name: Install Build Dependencies
237237
run: |
238238
sudo apt-get update
239-
sudo apt-get install -y git uuid-runtime genisoimage netcat ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
239+
sudo apt-get install -y git uuid-runtime genisoimage netcat-openbsd ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
240240
241241
- name: Install Python dependencies
242242
run: |
@@ -275,7 +275,7 @@ jobs:
275275
- name: Setup Simulator Prerequisites
276276
run: |
277277
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
278-
python3 -m pip install --user --upgrade tools/marvin/dist/Marvin-*.tar.gz
278+
python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
279279
mvn -q -Pdeveloper -pl developer -Ddeploydb
280280
mvn -q -Pdeveloper -pl developer -Ddeploydb-simulator
281281

0 commit comments

Comments
 (0)