Skip to content

Commit e37a4a7

Browse files
leerholeerho
authored
Merge pull request #627 from apache/update_7.0.X_from_main
Update 7.0.x from main
2 parents 247c611 + 8557163 commit e37a4a7

File tree

5 files changed

+74
-60
lines changed

5 files changed

+74
-60
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/auto-check_cpp_files.yml renamed to ‎.github/workflows/check_cpp_files.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
name: Auto C++ Serialization Compatibility Test
1+
name: CPP SerDe Compatibility Test
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
jobs:

‎.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/manual-javadoc.yml renamed to ‎.github/workflows/javadoc.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
name: Publish JavaDoc
1+
name: JavaDoc
22

33
on:
4-
pull_request:
5-
push:
6-
branches: [ 7.0.X ]
74
workflow_dispatch:
85

96
jobs:
@@ -25,10 +22,10 @@ jobs:
2522

2623
- name: Print Current workflow
2724
run: >
28-
cat .github/workflows/manual-javadoc.yml
25+
cat .github/workflows/javadoc.yml
2926
3027
- name: Generate JavaDoc
31-
run: mvn clean javadoc:javadoc
28+
run: mvn javadoc:javadoc
3229

3330
- name: Deploy JavaDoc
3431
uses: JamesIves/[email protected]

0 commit comments

Comments
 (0)