Skip to content

Commit

Permalink
Merge pull request #627 from apache/update_7.0.X_from_main
Browse files Browse the repository at this point in the history
Update 7.0.x from main
  • Loading branch information
leerho authored Jan 3, 2025
2 parents 247c611 + 8557163 commit e37a4a7
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 60 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/auto-jdk-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Auto JDK Matrix Test, Install
name: Auto JDK Matrix Test & Install

on:
pull_request:
push:
branches: [ 7.0.X ]
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
pull_request:
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
# The branches below must be a subset of the branches above
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:

env:
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/auto-os-matrix.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: Auto OS Matrix Test, Install
name: Auto OS Matrix Test & Install

on:
pull_request:
push:
branches: [ 7.0.X ]
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
pull_request:
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
# The branches below must be a subset of the branches above
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:

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

jobs:
build:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Auto C++ Serialization Compatibility Test
name: CPP SerDe Compatibility Test

on:
pull_request:
push:
branches: [ 7.0.X ]
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
pull_request:
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
# The branches below must be a subset of the branches above
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:

jobs:
Expand Down
93 changes: 49 additions & 44 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ name: "CodeQL"

on:
push:
branches:
- '7.0.X'
- 'main'
pull_request_target:
types:
- opened
branches:
- '7.0.X'
- 'main'
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
pull_request:
paths-ignore: [ '**/*.html', '**/*.md', '**/*.txt', '**/*.xml', '**/*.yaml', '**/*.yml', '**/.*', '**/LICENSE', '**/NOTICE' ]
# The branches below must be a subset of the branches above
branches: [ 'main', '[0-9]+.[0-9]+.[Xx]' ]
workflow_dispatch:

jobs:
Expand All @@ -33,46 +30,54 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# 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
queries: +security-and-quality


# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)

# -name: Autobuild
# uses: github/codeql-action/autobuild@v3

# 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.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

# Note: Autobuild fails thus the following manual build
- name: Manual Build With Java 17
- name: Setup Java
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: 'maven'
java-version: '17'

- name: Java Compile
run: mvn clean compile
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# Details on CodeQL's query packs refer to link below.

- name: Custom building using maven
run: >
mvn clean package -f "pom.xml" -B -V -e
-Dfindbugs.skip=true
-Dcheckstyle.skip=true
-Dpmd.skip=true
-Denforcer.skip
-Dmaven.javadoc.skip
-DskipTests=true
-Dmaven.test.skip.exec
-Dlicense.skip=true
-Dweb.console.skip=true
-Dgpg.skip=true
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
category: "/language:${{matrix.language}}"


# CodeQL's Query Packs:
# 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

# 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

# Architecture options: x86, x64, armv7, aarch64, ppc64le
# Lifecycles: validate, compile, test, package, verify, install, deploy
# -B batch mode, never stops for user input
# -V show Version without stopping
# -X debug mode
# -q quiet, only show errors
# -e produce execution error messages
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Publish JavaDoc
name: JavaDoc

on:
pull_request:
push:
branches: [ 7.0.X ]
workflow_dispatch:

jobs:
Expand All @@ -25,10 +22,10 @@ jobs:

- name: Print Current workflow
run: >
cat .github/workflows/manual-javadoc.yml
cat .github/workflows/javadoc.yml
- name: Generate JavaDoc
run: mvn clean javadoc:javadoc
run: mvn javadoc:javadoc

- name: Deploy JavaDoc
uses: JamesIves/[email protected]
Expand Down

0 comments on commit e37a4a7

Please sign in to comment.