Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to 17 using DS-Memory 4.0.0 with FFM/Panama #577

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5c7f5ab
Changes in ds-java required to move to java 17 as ds-java 7.x
leerho Jun 1, 2024
0bfac90
Fixes to align with modified Memory
leerho Jun 15, 2024
b984e65
Changes required for ds-java to move to java17 and also depend on
leerho Jun 20, 2024
59a3ff4
Add kll main 8 longs
leerho Oct 9, 2024
9c54687
Add all new kll longs files
leerho Oct 9, 2024
c0479b2
fix findbugs, includeMinMax, QuantilesUtil.
leerho Oct 9, 2024
7ee5cf3
More changes for 17
leerho Oct 9, 2024
2b44c6d
Added more robust checking of closing resources.
leerho Oct 10, 2024
9350991
remove extraneous offset increment
leerho Oct 10, 2024
e2f6b85
Updates to ds-java17
leerho Oct 13, 2024
9f48138
remove unnecessary cast
leerho Oct 13, 2024
3a5e67c
Update gitignore, pom, and fix one warning
leerho Nov 5, 2024
2355af7
Merge branch 'move_to_17_using_FFM' of [email protected]:apache/datasket…
leerho Nov 5, 2024
4a061fe
update GHA, pom
leerho Nov 17, 2024
d1853a9
Upload fixes as a result of CodeQL run.
leerho Nov 18, 2024
f42af45
Update again for coverage reported errors.
leerho Nov 18, 2024
34aaa8b
This huge update does not impact any code. It is mostly Javadoc updates.
leerho Dec 10, 2024
c57687b
Update README.md
leerho Dec 11, 2024
5fc852f
Update pom in preparation to create main based on 17.
leerho Dec 11, 2024
d0575f7
Update move_to_17_using_FFM with GHA workflow changes.
leerho Dec 17, 2024
8752c6a
update move_to_17_using_FFM with 6.1.X
leerho Dec 17, 2024
1417408
update GHA workflows
leerho Dec 18, 2024
341de43
update README.md
leerho Dec 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: Serialization Compatibility Test

on:
push:
branches:
- master
branches: [ master, main ]
workflow_dispatch:

jobs:
Expand All @@ -12,21 +11,34 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Checkout C++
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout C++
uses: actions/checkout@v4
with:
repository: apache/datasketches-cpp
path: cpp
- name: Configure C++ build

- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Configure C++ build
run: cd cpp/build && cmake .. -DGENERATE=true
- name: Build C++ unit tests

- name: Build C++ unit tests
run: cd cpp && cmake --build build --config Release
- name: Run C++ tests

- name: Run C++ tests
run: cd cpp && cmake --build build --config Release --target test
- name: Make dir

- name: Make dir
run: mkdir -p serialization_test_data/cpp_generated_files

- name: Copy files
run: cp cpp/build/*/test/*_cpp.sk serialization_test_data/cpp_generated_files
- name: Run Java tests

- name: Run Java tests
run: mvn test -P check-cpp-files
25 changes: 16 additions & 9 deletions .github/workflows/auto-jdk-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: DataSketches-Java Auto JDK Matrix Test & Install
on:
pull_request:
push:
branches: [ master ]
branches: [ master, main ]
workflow_dispatch:

env:
Expand All @@ -13,43 +13,47 @@ jobs:
build:
name: Build, Test, Install
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
jdk: [ 8,11 ]
jdk: [ 17 ]

env:
JDK_VERSION: ${{ matrix.jdk }}

steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Print Current workflow
run: >
cat .github/workflows/auto-jdk-matrix.yml

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: build-${{ runner.os }}-maven-

- name: Install Matrix JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
java-package: jdk
architecture: x64
# Architecture options: x86, x64, armv7, aarch64, ppc64le
# setup-java@v3 has a "with cache" option

- name: Echo Java Version
run: >
java -version

- name: Test
run: >
mvn clean test
mvn clean test -B
-Dmaven.javadoc.skip=true
-Dgpg.skip=true

Expand All @@ -59,7 +63,10 @@ jobs:
-DskipTests=true
-Dgpg.skip=true

# Architecture options: x86, x64, armv7, aarch64, ppc64le
# setup-java@v4 has a "with cache" option
# Lifecycle: validate, compile, test, package, verify, install, deploy
# -B batch mode
# -B batch mode, never stops for user input
# -V show Version without stopping
# -X debug mode
# -q quiet, only show errors
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
name: DataSketches-Java Manual OS Matrix Test & Install
name: DataSketches-Java Auto OS Matrix Test & Install

on:
pull_request:
push:
branches: [ master, main ]
workflow_dispatch:

env:
MAVEN_OPTS: -Xmx4g -Xms1g
MAVEN_OPTS: -Xmx1g -Xms1g

jobs:
build:
name: Build, Test, Install
runs-on: ${{matrix.os}}

strategy:
fail-fast: false

matrix:
jdk: [ 8, 11 ]
jdk: [ 17 ]
os: [ windows-latest, ubuntu-latest, macos-latest ]
include:
- os: windows-latest
Expand All @@ -26,31 +30,31 @@ jobs:
skip_javadoc: -Dmaven.javadoc.skip=true
skip_gpg: -Dgpg.skip=true

runs-on: ${{matrix.os}}

env:
JDK_VERSION: ${{ matrix.jdk }}

steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false

- name: Cache local Maven repository
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.m2/repository
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: build-${{ runner.os }}-maven-

- name: Install Matrix JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
java-package: jdk
architecture: x64
# Architecture options: x86, x64, armv7, aarch64, ppc64le
# setup-java@v3 has a "with cache" option

- name: Echo Java Version
run: >
Expand All @@ -69,6 +73,8 @@ jobs:
-D skipTests=true
${{matrix.os.skip_gpg}}

# Architecture options: x86, x64, armv7, aarch64, ppc64le
# setup-java@v4 has a "with cache" option
# Lifecycle: validate, compile, test, package, verify, install, deploy
# -B batch mode
# -V show Version without stopping
Expand Down
23 changes: 0 additions & 23 deletions .github/workflows/javadoc.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
name: "CodeQL"

on:
push:
branches: [ 'master' ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ 'master' ]
schedule:
- cron: '10 17 * * 4'
workflow_dispatch:

jobs:
Expand All @@ -28,11 +21,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -46,10 +39,10 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v3
uses: github/codeql-action/autobuild@v4

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# Command-line programs to run using the OS shell.
# See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
Expand All @@ -59,6 +52,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
with:
category: "/language:${{matrix.language}}"
71 changes: 0 additions & 71 deletions .github/workflows/manual-coverage.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/manual-javadoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: JavaDoc

on:
workflow_dispatch:

jobs:
javadoc:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'

- name: Echo Java Version
run: java -version

- name: Print Current workflow
run: >
cat .github/workflows/manual-javadoc.yml

- name: Generate JavaDoc
run: mvn javadoc:javadoc

- name: Deploy JavaDoc
uses: JamesIves/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
folder: target/site/apidocs
target-folder: docs/${{ github.ref_name }}
branch: gh-pages
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
*.ipr
*.iws

# VSCode project files
**/.vscode/

# Additional tools
.clover/

Expand Down
Loading