Skip to content

Commit 247c611

Browse files
leerholeerho
authored
Merge pull request #621 from apache/fix_GHAW_manual-javadoc.yml
fix indentations in all workflows and try to fix CodeQL
2 parents 12d9511 + ef3310d commit 247c611

9 files changed

Lines changed: 199 additions & 256 deletions

‎.github/workflows/auto-check_cpp_files.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
name: Serialization Compatibility Test
1+
name: Auto C++ Serialization Compatibility Test
22

33
on:
4+
pull_request:
45
push:
5-
branches: [ master, main ]
6+
branches: [ 7.0.X ]
67
workflow_dispatch:
78

89
jobs:

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

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
1-
name: DataSketches-Java Auto JDK Matrix Test & Install
1+
name: Auto JDK Matrix Test, Install
22

33
on:
4-
pull_request:
5-
push:
6-
branches: [ master, main ]
7-
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches: [ 7.0.X ]
7+
workflow_dispatch:
88

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

1212
jobs:
13-
build:
14-
name: Build, Test, Install
15-
runs-on: ubuntu-latest
13+
build:
14+
name: Build, Test, Install
15+
runs-on: ubuntu-latest
1616

17-
strategy:
18-
fail-fast: false
19-
matrix:
20-
jdk: [ 17 ]
17+
strategy:
18+
fail-fast: false
19+
matrix:
20+
jdk: [ 17 ]
2121

22-
env:
23-
JDK_VERSION: ${{ matrix.jdk }}
22+
env:
23+
JDK_VERSION: ${{ matrix.jdk }}
2424

25-
steps:
26-
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
27-
uses: actions/checkout@v4
28-
with:
29-
persist-credentials: false
25+
steps:
26+
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
27+
uses: actions/checkout@v4
28+
with:
29+
persist-credentials: false
3030

31-
- name: Print Current workflow
32-
run: >
33-
cat .github/workflows/auto-jdk-matrix.yml
31+
- name: Print Current workflow
32+
run: >
33+
cat .github/workflows/auto-jdk-matrix.yml
3434
35-
- name: Cache local Maven repository
36-
uses: actions/cache@v4
37-
with:
38-
path: ~/.m2/repository
39-
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40-
restore-keys: build-${{ runner.os }}-maven-
35+
- name: Cache local Maven repository
36+
uses: actions/cache@v4
37+
with:
38+
path: ~/.m2/repository
39+
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
40+
restore-keys: build-${{ runner.os }}-maven-
4141

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
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
4949

50-
- name: Echo Java Version
51-
run: >
52-
java -version
50+
- name: Echo Java Version
51+
run: >
52+
java -version
5353
54-
- name: Test
55-
run: >
56-
mvn clean test -B
57-
-Dmaven.javadoc.skip=true
58-
-Dgpg.skip=true
54+
- name: Test
55+
run: >
56+
mvn clean test -B
57+
-Dmaven.javadoc.skip=true
58+
-Dgpg.skip=true
5959
60-
- name: Install
61-
run: >
62-
mvn clean install -B
63-
-DskipTests=true
64-
-Dgpg.skip=true
60+
- name: Install
61+
run: >
62+
mvn clean install -B
63+
-DskipTests=true
64+
-Dgpg.skip=true
6565
6666
# Architecture options: x86, x64, armv7, aarch64, ppc64le
6767
# setup-java@v4 has a "with cache" option

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

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
name: DataSketches-Java Auto OS Matrix Test & Install
1+
name: Auto OS Matrix Test, Install
22

33
on:
4-
pull_request:
5-
push:
6-
branches: [ master, main ]
7-
workflow_dispatch:
4+
pull_request:
5+
push:
6+
branches: [ 7.0.X ]
7+
workflow_dispatch:
88

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

1212
jobs:
13-
build:
14-
name: Build, Test, Install
13+
build:
14+
name: Build, Test, Install
1515

16-
strategy:
17-
fail-fast: false
16+
strategy:
17+
fail-fast: false
1818

19-
matrix:
20-
jdk: [ 17 ]
21-
os: [ windows-latest, ubuntu-latest, macos-latest ]
22-
include:
23-
- os: windows-latest
24-
skip_javadoc: "`-Dmaven`.javadoc`.skip=true"
25-
skip_gpg: "`-Dgpg`.skip=true"
26-
- os: ubuntu-latest
27-
skip_javadoc: -Dmaven.javadoc.skip=true
28-
skip_gpg: -Dgpg.skip=true
29-
- os: macos-latest
30-
skip_javadoc: -Dmaven.javadoc.skip=true
31-
skip_gpg: -Dgpg.skip=true
19+
matrix:
20+
jdk: [ 17 ]
21+
os: [ windows-latest, ubuntu-latest, macos-latest ]
22+
include:
23+
- os: windows-latest
24+
skip_javadoc: "`-Dmaven`.javadoc`.skip=true"
25+
skip_gpg: "`-Dgpg`.skip=true"
26+
- os: ubuntu-latest
27+
skip_javadoc: -Dmaven.javadoc.skip=true
28+
skip_gpg: -Dgpg.skip=true
29+
- os: macos-latest
30+
skip_javadoc: -Dmaven.javadoc.skip=true
31+
skip_gpg: -Dgpg.skip=true
3232

33-
runs-on: ${{matrix.os}}
33+
runs-on: ${{matrix.os}}
3434

35-
env:
36-
JDK_VERSION: ${{ matrix.jdk }}
35+
env:
36+
JDK_VERSION: ${{ matrix.jdk }}
3737

38-
steps:
39-
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
40-
uses: actions/checkout@v4
41-
with:
42-
persist-credentials: false
38+
steps:
39+
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
40+
uses: actions/checkout@v4
41+
with:
42+
persist-credentials: false
4343

44-
- name: Cache local Maven repository
45-
uses: actions/cache@v4
46-
with:
47-
path: ~/.m2/repository
48-
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
49-
restore-keys: build-${{ runner.os }}-maven-
44+
- name: Cache local Maven repository
45+
uses: actions/cache@v4
46+
with:
47+
path: ~/.m2/repository
48+
key: build-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
49+
restore-keys: build-${{ runner.os }}-maven-
5050

51-
- name: Install Matrix JDK
52-
uses: actions/setup-java@v4
53-
with:
54-
java-version: ${{ matrix.jdk }}
55-
distribution: 'temurin'
56-
java-package: jdk
57-
architecture: x64
51+
- name: Install Matrix JDK
52+
uses: actions/setup-java@v4
53+
with:
54+
java-version: ${{ matrix.jdk }}
55+
distribution: 'temurin'
56+
java-package: jdk
57+
architecture: x64
5858

59-
- name: Echo Java Version
60-
run: >
61-
java -version
59+
- name: Echo Java Version
60+
run: >
61+
java -version
6262
63-
- name: Test
64-
run: >
65-
mvn clean test
66-
${{matrix.os.skip_javadoc}}
67-
${{matrix.os.skip_gpg}}
63+
- name: Test
64+
run: >
65+
mvn clean test
66+
${{matrix.os.skip_javadoc}}
67+
${{matrix.os.skip_gpg}}
6868
69-
- name: Install
70-
run: >
71-
mvn clean install -B
72-
${{matrix.os.skip_javadoc}}
73-
-D skipTests=true
74-
${{matrix.os.skip_gpg}}
69+
- name: Install
70+
run: >
71+
mvn clean install -B
72+
${{matrix.os.skip_javadoc}}
73+
-D skipTests=true
74+
${{matrix.os.skip_gpg}}
7575
7676
# Architecture options: x86, x64, armv7, aarch64, ppc64le
7777
# setup-java@v4 has a "with cache" option

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: "CodeQL"
2+
3+
on:
4+
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'
14+
workflow_dispatch:
15+
16+
jobs:
17+
analyze:
18+
name: Analyze
19+
runs-on: ubuntu-latest
20+
permissions:
21+
actions: read
22+
contents: read
23+
security-events: write
24+
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
language: [ 'java' ]
29+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
30+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
31+
32+
steps:
33+
- name: Checkout repository
34+
uses: actions/checkout@v4
35+
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
67+
uses: actions/setup-java@v4
68+
with:
69+
java-version: '17'
70+
distribution: 'temurin'
71+
72+
- name: Java Compile
73+
run: mvn clean compile
74+
75+
- name: Perform CodeQL Analysis
76+
uses: github/codeql-action/analyze@v3
77+
with:
78+
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)