Skip to content

Commit

Permalink
Only java 11
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Jansen <[email protected]>
  • Loading branch information
@farodin91
farodin91 committed Nov 12, 2023
1 parent ba4b083 commit 84687f7
Show file tree
Hide file tree
Showing 26 changed files with 100 additions and 520 deletions.
86 changes: 6 additions & 80 deletions .github/workflows/ci-backend-cql-dummy.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ name: CI Backend CQL
on:
pull_request:
paths:
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'

jobs:
tests:
Expand All @@ -33,164 +33,90 @@ jobs:
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
java: 8
- module: cql
args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
java: 8
- module: cql
args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
name: scylladb-diskstorage
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
name: scylladb-graphdb
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/hadoop/*\""
name: scylladb-hadoop
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/core/cql/*\""
name: scylladb-core
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
name: scylladb-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
name: scylladb-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/hadoop/*\""
name: scylladb-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/core/cql/*\""
name: scylladb-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
install-args: "-Pjava-11"
java: 11
steps:
- run: 'echo "No build required"'
102 changes: 14 additions & 88 deletions .github/workflows/ci-backend-cql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ name: CI Backend CQL
on:
pull_request:
paths-ignore:
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'
push:
paths-ignore:
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'
- 'docs/**'
- '.github/workflows/ci-docs.yml'
- '.github/ISSUE_TEMPLATE/**'
- 'requirements.txt'
- 'docs.Dockerfile'
- '*.md'
branches-ignore:
- 'dependabot/**'

Expand All @@ -51,7 +51,7 @@ jobs:
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
with:
java-version: 8
java-version: 11
distribution: zulu
- run: mvn clean install --projects janusgraph-all -Pjanusgraph-cache -Dmaven.javadoc.skip=true ${{ env.BUILD_MAVEN_OPTS }}
- run: mvn verify --projects janusgraph-all -Pjanusgraph-cache ${{ env.VERIFY_MAVEN_OPTS }}
Expand All @@ -66,164 +66,90 @@ jobs:
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
java: 8
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
java: 8
- module: cql
args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
java: 8
- module: cql
args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
name: scylladb-diskstorage
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
name: scylladb-graphdb
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/hadoop/*\""
name: scylladb-hadoop
java: 8
- module: cql
args: "-Pscylladb -Dtest=\"**/core/cql/*\""
name: scylladb-core
java: 8
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra3-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/diskstorage/cql/*\""
name: scylladb-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/graphdb/cql/*\""
name: scylladb-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/hadoop/*\""
name: scylladb-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pscylladb -Dtest=\"**/core/cql/*\""
name: scylladb-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/diskstorage/cql/*\""
name: byteordered-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/diskstorage/cql/*\""
name: murmur-diskstorage
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/graphdb/cql/*\""
name: byteordered-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/graphdb/cql/*\""
name: murmur-graphdb
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/hadoop/*\""
name: murmur-hadoop
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-byteordered -Dtest=\"**/core/cql/*\""
name: byteordered-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur -Dtest=\"**/core/cql/*\""
name: murmur-core
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur-ssl -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-ssl
install-args: "-Pjava-11"
java: 11
- module: cql
args: "-Pcassandra4-murmur-client-auth -Dtest=\"**/diskstorage/cql/CQLStoreTest.java\""
name: murmur-client-auth
install-args: "-Pjava-11"
java: 11
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -286,7 +212,7 @@ jobs:
${{ runner.os }}-maven-
- uses: actions/setup-java@v3
with:
java-version: 8
java-version: 11
distribution: zulu
- run: mvn clean install --projects janusgraph-${{ matrix.module }} ${{ env.BUILD_MAVEN_OPTS }} ${{ matrix.install-args }}
- run: mvn verify --projects janusgraph-${{ matrix.module }} -Dcassandra.docker.version='3.0.18' ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }}
Loading

0 comments on commit 84687f7

Please sign in to comment.