Skip to content

Commit d0575f7

Browse files
committed
Update move_to_17_using_FFM with GHA workflow changes.
1 parent 5fc852f commit d0575f7

File tree

4 files changed

+38
-33
lines changed

4 files changed

+38
-33
lines changed

.github/workflows/check_cpp_files.yml renamed to .github/workflows/auto-check_cpp_files.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ name: Serialization Compatibility Test
22

33
on:
44
push:
5-
branches:
6-
- master
5+
branches: [ master, main ]
76
workflow_dispatch:
87

98
jobs:
@@ -12,21 +11,34 @@ jobs:
1211
runs-on: ubuntu-latest
1312
steps:
1413
- name: Checkout
15-
uses: actions/checkout@v3
16-
- name: Checkout C++
17-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
15+
16+
- name: Checkout C++
17+
uses: actions/checkout@v4
1818
with:
1919
repository: apache/datasketches-cpp
2020
path: cpp
21-
- name: Configure C++ build
21+
22+
- name: Setup Java
23+
uses: actions/setup-java@v4
24+
with:
25+
java-version: '17'
26+
distribution: 'temurin'
27+
28+
- name: Configure C++ build
2229
run: cd cpp/build && cmake .. -DGENERATE=true
23-
- name: Build C++ unit tests
30+
31+
- name: Build C++ unit tests
2432
run: cd cpp && cmake --build build --config Release
25-
- name: Run C++ tests
33+
34+
- name: Run C++ tests
2635
run: cd cpp && cmake --build build --config Release --target test
27-
- name: Make dir
36+
37+
- name: Make dir
2838
run: mkdir -p serialization_test_data/cpp_generated_files
39+
2940
- name: Copy files
3041
run: cp cpp/build/*/test/*_cpp.sk serialization_test_data/cpp_generated_files
31-
- name: Run Java tests
42+
43+
- name: Run Java tests
3244
run: mvn test -P check-cpp-files

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
workflow_dispatch:
88

99
env:
10-
MAVEN_OPTS: -Xmx1g -Xms1g
10+
MAVEN_OPTS: -Xmx4g -Xms1g
1111

1212
jobs:
1313
build:
@@ -16,9 +16,11 @@ jobs:
1616

1717
strategy:
1818
fail-fast: false
19+
matrix:
20+
jdk: [ 17 ]
1921

2022
env:
21-
JDK_VERSION: 17
23+
JDK_VERSION: ${{ matrix.jdk }}
2224

2325
steps:
2426
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
@@ -30,21 +32,21 @@ jobs:
3032
run: >
3133
cat .github/workflows/auto-jdk-matrix.yml
3234
33-
- name: Setup Java
34-
uses: actions/setup-java@v4
35-
with:
36-
distribution: 'temurin'
37-
java-package: jdk
38-
architecture: x64
39-
java-version: 17
40-
4135
- name: Cache local Maven repository
4236
uses: actions/cache@v4
4337
with:
4438
path: ~/.m2/repository
4539
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4640
restore-keys: build-${{ runner.os }}-maven-
4741

42+
- name: Install Matrix JDK
43+
uses: actions/setup-java@v4
44+
with:
45+
java-version: ${{ matrix.jdk }}
46+
distribution: 'temurin'
47+
java-package: jdk
48+
architecture: x64
49+
4850
- name: Echo Java Version
4951
run: >
5052
java -version

.github/workflows/codeql-analysis.yml renamed to .github/workflows/manual-codeql-analysis.yml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
name: "CodeQL"
22

33
on:
4-
# push:
5-
# branches: [ 'master' ]
6-
# pull_request:
7-
# The branches below must be a subset of the branches above
8-
# branches: [ 'master' ]
9-
# schedule:
10-
# - cron: '10 17 * * 4'
114
workflow_dispatch:
125

136
jobs:
@@ -48,8 +41,8 @@ jobs:
4841
- name: Autobuild
4942
uses: github/codeql-action/autobuild@v4
5043

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

5447
# If the Autobuild fails above, remove it and uncomment the following three lines.
5548
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: JavaDoc
22

33
on:
4-
push:
5-
branches: [ master, main ]
64
workflow_dispatch:
75

86
jobs:
@@ -24,7 +22,7 @@ jobs:
2422

2523
- name: Print Current workflow
2624
run: >
27-
cat .github/workflows/javadoc.yml
25+
cat .github/workflows/manual-javadoc.yml
2826
2927
- name: Generate JavaDoc
3028
run: mvn javadoc:javadoc
@@ -33,6 +31,6 @@ jobs:
3331
uses: JamesIves/github-pages-deploy-action@v4.6.8
3432
with:
3533
token: ${{ secrets.GITHUB_TOKEN }}
36-
folder: target/reports/apidocs
34+
folder: target/site/apidocs
3735
target-folder: docs/${{ github.ref_name }}
3836
branch: gh-pages

0 commit comments

Comments
 (0)