Skip to content

Commit

Permalink
Merge pull request #313 from jajik/use-ubuntu-latest
Browse files Browse the repository at this point in the history
Update tests now that Ubuntu 24.04 is the new default
  • Loading branch information
rhusar authored Jan 9, 2025
2 parents 14c977d + aebd52d commit ffc8aac
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ jobs:
podman build -f ./podmanfile
clang-format-style-check:
# The ubuntu-latest has an old version of clang-format, let's use ubuntu-24.04 which is in Beta
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -229,13 +228,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Stop Mono and XSP
# These occupy port 8084 unnecessarily
run: |
sudo systemctl stop mono-xsp4.service || true
sudo systemctl disable mono-xsp4.service || true
sudo killall mono || true
sudo killall xsp4 || true
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
Expand All @@ -244,7 +236,8 @@ jobs:
- name: Setup dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y docker maven git curl iproute2 wcstools
sudo apt-get install -y podman-docker maven git curl iproute2 wcstools
sudo touch /etc/containers/nodocker
cd test
sh setup-dependencies.sh
- name: Print network environment
Expand Down

0 comments on commit ffc8aac

Please sign in to comment.