Skip to content

Commit 95935f8

Browse files
leerholeerho
committed
Merge branch 'main' into 7.0.X
2 parents 247c611 + 5e6048c commit 95935f8

File tree

6 files changed

+150
-52
lines changed

6 files changed

+150
-52
lines changed

‎.github/workflows/auto-jdk-matrix.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
name: Auto JDK Matrix Test, Install
1+
name: Auto JDK Matrix Test & Install
22

33
on:
4-
pull_request:
54
push:
6-
branches: [ 7.0.X ]
5+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
6+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
7+
pull_request:
8+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
9+
# The branches below must be a subset of the branches above
10+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
711
workflow_dispatch:
812

913
env:

‎.github/workflows/auto-os-matrix.yml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
1-
name: Auto OS Matrix Test, Install
1+
name: Auto OS Matrix Test & Install
22

33
on:
4-
pull_request:
54
push:
6-
branches: [ 7.0.X ]
5+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
6+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
7+
pull_request:
8+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
9+
# The branches below must be a subset of the branches above
10+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
711
workflow_dispatch:
812

913
env:
10-
MAVEN_OPTS: -Xmx1g -Xms1g
14+
MAVEN_OPTS: -Xmx4g -Xms1g
1115

1216
jobs:
1317
build:

‎.github/workflows/check_cpp_files.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: CPP SerDe Compatibility Test
2+
3+
on:
4+
push:
5+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
6+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
7+
pull_request:
8+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
9+
# The branches below must be a subset of the branches above
10+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
11+
workflow_dispatch:
12+
13+
jobs:
14+
build:
15+
name: SerDe Test
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Checkout C++
22+
uses: actions/checkout@v4
23+
with:
24+
repository: apache/datasketches-cpp
25+
path: cpp
26+
27+
- name: Setup Java
28+
uses: actions/setup-java@v4
29+
with:
30+
java-version: '17'
31+
distribution: 'temurin'
32+
33+
- name: Configure C++ build
34+
run: cd cpp/build && cmake .. -DGENERATE=true
35+
36+
- name: Build C++ unit tests
37+
run: cd cpp && cmake --build build --config Release
38+
39+
- name: Run C++ tests
40+
run: cd cpp && cmake --build build --config Release --target test
41+
42+
- name: Make dir
43+
run: mkdir -p serialization_test_data/cpp_generated_files
44+
45+
- name: Copy files
46+
run: cp cpp/build/*/test/*_cpp.sk serialization_test_data/cpp_generated_files
47+
48+
- name: Run Java tests
49+
run: mvn test -P check-cpp-files

‎.github/workflows/codeql-analysis.yml

+49-44
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches:
6-
- '7.0.X'
7-
- 'main'
8-
pull_request_target:
9-
types:
10-
- opened
11-
branches:
12-
- '7.0.X'
13-
- 'main'
5+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
6+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
7+
pull_request:
8+
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
9+
# The branches below must be a subset of the branches above
10+
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
1411
workflow_dispatch:
1512

1613
jobs:
@@ -33,46 +30,54 @@ jobs:
3330
- name: Checkout repository
3431
uses: actions/checkout@v4
3532

36-
# Initializes the CodeQL tools for scanning.
37-
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@v3
39-
with:
40-
languages: ${{ matrix.language }}
41-
# If you wish to specify custom queries, you can do so here or in a config file.
42-
# By default, queries listed here will override any specified in a config file.
43-
# Prefix the list here with "+" to use these queries and those in the config file.
44-
45-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
46-
queries: +security-and-quality
47-
48-
49-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
50-
# If this step fails, then you should remove it and run the build manually (see below)
51-
52-
# -name: Autobuild
53-
# uses: github/codeql-action/autobuild@v3
54-
55-
# Command-line programs to run using the OS shell.
56-
# See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
57-
58-
# If the Autobuild fails above, remove it and uncomment the following three lines.
59-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
60-
61-
# - run: |
62-
# echo "Run, Build Application using script"
63-
# ./location_of_script_within_repo/buildscript.sh
64-
65-
# Note: Autobuild fails thus the following manual build
66-
- name: Manual Build With Java 17
33+
- name: Setup Java
6734
uses: actions/setup-java@v4
6835
with:
69-
java-version: '17'
7036
distribution: 'temurin'
37+
cache: 'maven'
38+
java-version: '17'
7139

72-
- name: Java Compile
73-
run: mvn clean compile
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@v3
42+
with:
43+
languages: ${{ matrix.language }}
44+
queries: +security-and-quality
45+
46+
# If you wish to specify custom queries, you can do so here or in a config file.
47+
# By default, queries listed here will override any specified in a config file.
48+
# Prefix the list here with "+" to use these queries and those in the config file.
49+
# Details on CodeQL's query packs refer to link below.
7450

51+
- name: Custom building using maven
52+
run: >
53+
mvn clean package -f "pom.xml" -B -V -e
54+
-Dfindbugs.skip=true
55+
-Dcheckstyle.skip=true
56+
-Dpmd.skip=true
57+
-Denforcer.skip
58+
-Dmaven.javadoc.skip
59+
-DskipTests=true
60+
-Dmaven.test.skip.exec
61+
-Dlicense.skip=true
62+
-Dweb.console.skip=true
63+
-Dgpg.skip=true
64+
7565
- name: Perform CodeQL Analysis
7666
uses: github/codeql-action/analyze@v3
7767
with:
78-
category: "/language:${{matrix.language}}"
68+
category: "/language:${{matrix.language}}"
69+
70+
71+
# CodeQL's Query Packs:
72+
# https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
73+
74+
# Command-line programs to run using the OS shell.
75+
# See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
76+
77+
# Architecture options: x86, x64, armv7, aarch64, ppc64le
78+
# Lifecycles: validate, compile, test, package, verify, install, deploy
79+
# -B batch mode, never stops for user input
80+
# -V show Version without stopping
81+
# -X debug mode
82+
# -q quiet, only show errors
83+
# -e produce execution error messages

‎.github/workflows/javadoc.yml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: JavaDoc
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
javadoc:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Checkout
12+
uses: actions/checkout@v4
13+
14+
- name: Setup Java
15+
uses: actions/setup-java@v4
16+
with:
17+
java-version: '17'
18+
distribution: 'temurin'
19+
20+
- name: Echo Java Version
21+
run: java -version
22+
23+
- name: Print Current workflow
24+
run: >
25+
cat .github/workflows/javadoc.yml
26+
27+
- name: Generate JavaDoc
28+
run: mvn javadoc:javadoc
29+
30+
- name: Deploy JavaDoc
31+
uses: JamesIves/[email protected]
32+
with:
33+
token: ${{ secrets.GITHUB_TOKEN }}
34+
folder: target/reports/apidocs
35+
target-folder: docs/${{ github.ref_name }}
36+
branch: gh-pages

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ under the License.
3333

3434
<groupId>org.apache.datasketches</groupId>
3535
<artifactId>datasketches-java</artifactId>
36-
<version>7.0.0</version>
36+
<version>7.1.0-SNAPSHOT</version>
3737
<packaging>jar</packaging>
3838

3939
<name>${project.artifactId}</name>

0 commit comments

Comments
 (0)