Skip to content

Commit

Permalink
Bump ubuntu version in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
secwall committed Nov 27, 2024
1 parent fbbf193 commit 3f1c252
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/func-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ on:

env:
GO_VERSION: 1.23.3
DOCKER_API_VERSION: 1.43
DOCKER_API_VERSION: 1.45

jobs:
prepare:
name: Prepare
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:

test:
name: Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [ prepare ]
strategy:
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:
golangci:
name: lint
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/setup-go@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jepsen-cluster-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jepsen-sentinel-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
test:
name: Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:
jobs:
unittest:
name: all_unittests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Set up Go 1.x
uses: actions/setup-go@v5
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ unittests:
go test ./cmd/... ./tests/testutil/matchers/

redis/src/redis-server:
docker run --rm -v ${CURDIR}:/app -w /app ubuntu:jammy /app/redis_patches/build.sh
docker run --rm -v ${CURDIR}:/app -w /app ubuntu:noble /app/redis_patches/build.sh

test: base_image redis/src/redis-server cmd/rdsync/rdsync recreate_logs
rm -rf ./tests/images/redis/rdsync && cp cmd/rdsync/rdsync ./tests/images/redis/rdsync
Expand Down
2 changes: 1 addition & 1 deletion tests/images/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:jammy
FROM ubuntu:noble
ENV container docker
ENV DEBIAN_FRONTEND noninteractive
COPY . /var/lib/dist/base
Expand Down
2 changes: 1 addition & 1 deletion tests/images/base/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apt install less \
faketime \
iptables \
openssl \
netcat
netcat-traditional

rm -rf /var/run
ln -s /dev/shm /var/run
Expand Down

0 comments on commit 3f1c252

Please sign in to comment.