Skip to content

Commit

Permalink
improvement(workflows): Update Scylla and Java version in workflows
Browse files Browse the repository at this point in the history
- Update to Java 11 and 2025-01-19T09:39:05Z
  • Loading branch information
pehala authored and fruch committed Jan 27, 2025
1 parent 182cb59 commit 891bbdf
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
name: CCM Integration tests
uses: ./.github/workflows/integration-tests.yml
with:
reloc_version: "2023-04-13T13:31:00Z"
reloc_version: "2025-01-19T09:39:05Z"
ci-with-nix:
name: CCM Integration tests (using Nix)
uses: ./.github/workflows/nix.yml
with:
reloc_version: "2023-04-13T13:31:00Z"
reloc_version: "2025-01-19T09:39:05Z"
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '8'
java-version: '11'

- name: Install dependencies
run: |
Expand Down
8 changes: 4 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ localhost.";
in
rec {
packages = rec {
scylla_ccm = python: make_ccm_package { inherit python pkgs ; jdk = pkgs.jdk8; };
scylla_ccm = python: make_ccm_package { inherit python pkgs ; jdk = pkgs.jdk11; };
default = scylla_ccm pkgs.python311;
};
devShell =
pkgs.mkShell {
buildInputs = [ pkgs.poetry pkgs.glibcLocales (prepare_python_requirements pkgs.python39) (prepare_python_requirements pkgs.python311) pkgs.jdk8];
buildInputs = [ pkgs.poetry pkgs.glibcLocales (prepare_python_requirements pkgs.python39) (prepare_python_requirements pkgs.python311) pkgs.jdk11];
shellHook = ''
set JAVA_HOME ${pkgs.jdk8}
set JAVA_HOME ${pkgs.jdk11}
'';
};
}
) // rec {
overlays.default = final: prev: {
scylla_ccm = python: make_ccm_package { inherit python; jdk = final.jdk8; pkgs = final; };
scylla_ccm = python: make_ccm_package { inherit python; jdk = final.jdk11; pkgs = final; };
};
};
}

0 comments on commit 891bbdf

Please sign in to comment.