Skip to content

Commit

Permalink
Update 6.1.1 from master GitHub Actions workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
leerho committed Dec 13, 2024
1 parent a5527b4 commit 060037e
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 103 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 @@ -19,7 +18,7 @@ jobs:
repository: apache/datasketches-cpp
path: cpp
- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '11'
distribution: 'temurin'
Expand Down
21 changes: 14 additions & 7 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 ]

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@v3 has a "with cache" option
# Lifecycle: validate, compile, test, package, verify, install, deploy
# -B batch mode
# -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 8 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: [ 8 ]
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
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 Down
71 changes: 0 additions & 71 deletions .github/workflows/manual-coverage.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
name: JavaDoc

on:
push:
branches:
- master
workflow_dispatch:

jobs:
javadoc:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Generate JavaDoc
run: mvn javadoc:javadoc
- name: Deploy JavaDoc
Expand Down

0 comments on commit 060037e

Please sign in to comment.