Skip to content

Commit

Permalink
Update move_to_17_using_FFM with GHA workflow changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
leerho committed Dec 17, 2024
1 parent 5fc852f commit d0575f7
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 33 deletions.
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
22 changes: 12 additions & 10 deletions .github/workflows/auto-jdk-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:

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

This comment has been minimized.

Copy link
@jmalkin

jmalkin Dec 19, 2024

Contributor

Didn't realize we need up to 4gb


jobs:
build:
Expand All @@ -16,9 +16,11 @@ jobs:

strategy:
fail-fast: false
matrix:
jdk: [ 17 ]

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

steps:
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
Expand All @@ -30,21 +32,21 @@ jobs:
run: >
cat .github/workflows/auto-jdk-matrix.yml
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-package: jdk
architecture: x64
java-version: 17

- name: Cache local Maven repository
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@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'temurin'
java-package: jdk
architecture: x64

- name: Echo Java Version
run: >
java -version
Expand Down
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 Down Expand Up @@ -48,8 +41,8 @@ jobs:
- name: Autobuild
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 Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: JavaDoc

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

jobs:
Expand All @@ -24,7 +22,7 @@ jobs:

- name: Print Current workflow
run: >
cat .github/workflows/javadoc.yml
cat .github/workflows/manual-javadoc.yml
- name: Generate JavaDoc
run: mvn javadoc:javadoc
Expand All @@ -33,6 +31,6 @@ jobs:
uses: JamesIves/github-pages-deploy-action@v4.6.8
with:
token: ${{ secrets.GITHUB_TOKEN }}
folder: target/reports/apidocs
folder: target/site/apidocs
target-folder: docs/${{ github.ref_name }}
branch: gh-pages

0 comments on commit d0575f7

Please sign in to comment.