diff --git a/.github/workflows/build-lint-and-test.yml b/.github/workflows/build-lint-and-test.yml index 615ddbc0..9b37a7d6 100644 --- a/.github/workflows/build-lint-and-test.yml +++ b/.github/workflows/build-lint-and-test.yml @@ -21,7 +21,7 @@ env: jobs: build-lint-and-unit-test: name: Build, lint and run unit tests - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 @@ -51,7 +51,7 @@ jobs: scylla-integration-tests: name: Scylla ITs - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: [build-lint-and-unit-test] timeout-minutes: 90 @@ -148,7 +148,7 @@ jobs: path: ${{ env.CCM_LOGS_PATTERN }} cassandra-integration-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: [build-lint-and-unit-test] strategy: diff --git a/.github/workflows/pkg.yml b/.github/workflows/pkg.yml index 01b9ae88..4a1c55f5 100644 --- a/.github/workflows/pkg.yml +++ b/.github/workflows/pkg.yml @@ -12,7 +12,7 @@ env: jobs: build-rpm-pkgs: name: Build rpm packages - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest container: image: fedora:latest # Required by `mock`: @@ -49,7 +49,7 @@ jobs: build-deb-pkgs: name: Build deb packages - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest strategy: matrix: diff --git a/Makefile b/Makefile index a3f014f3..031862fe 100644 --- a/Makefile +++ b/Makefile @@ -181,10 +181,10 @@ install-java8-if-missing: } install-build-dependencies: update-apt-cache-if-needed - @sudo apt-get install -y libssl1.1 libuv1-dev libkrb5-dev libc6-dbg + @sudo apt-get install -y libuv1-dev libkrb5-dev libc6-dbg install-bin-dependencies: update-apt-cache-if-needed - @sudo apt-get install -y libssl1.1 libuv1-dev libkrb5-dev libc6-dbg + @sudo apt-get install -y libuv1-dev libkrb5-dev libc6-dbg build-integration-test-bin: @{\