This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 8c60e3efb [ISSUE #4737] Separate codeql workflow (#4740)
8c60e3efb is described below
commit 8c60e3efbefbf274914f842c9308f07a14087766
Author: Clay Johnson <[email protected]>
AuthorDate: Sat Jan 13 23:20:02 2024 -0600
[ISSUE #4737] Separate codeql workflow (#4740)
* Add GRADLE_ENTERPRISE_ACCESS_KEY to a couple of Gradle builds missing it
* Update to most recent Gradle Enterprise Gradle Plugin
* Move CodeQL verification to its own worfklow
* Rename CodeQL workflow to "Analyze"
* Rename "Build" workflow to "Docker"
* Restore the language matrix with 'java' as the only language in ci
workflow
* Return the cpp/csharp language step in ci workflow
* Rename CodeQL job to "Analyze" rather than "Build"
---
.github/workflows/ci.yml | 18 +++------
.github/workflows/{ci.yml => codeql.yml} | 54 ++++-----------------------
.github/workflows/{build.yaml => docker.yaml} | 2 +-
settings.gradle | 2 +-
4 files changed, 14 insertions(+), 62 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2123d1ba3..e6018573c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,22 +33,13 @@ jobs:
matrix:
os: [ ubuntu-latest, macOS-latest ]
java: [ 8, 11 ]
- language: ['java', 'go']
+ language: ['java']
runs-on: ${{ matrix.os }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
- - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
- with:
- # 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.
- # queries: ./path/to/local/query, your-org/your-repo/queries@main
- languages: ${{ matrix.language }}
-
- if: matrix.language == 'cpp' || matrix.language == 'csharp'
name: Build C
run: |
@@ -67,6 +58,8 @@ jobs:
- name: GenerateGrammarSource
run: ./gradlew clean generateGrammarSource --parallel --daemon
+ env:
+ GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
@@ -85,9 +78,6 @@ jobs:
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
- - name: Perform CodeQL analysis
- uses: github/codeql-action/analyze@v2
-
- name: Upload coverage report to codecov.io
run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload
coverage report!'
@@ -107,3 +97,5 @@ jobs:
- name: Check third party dependencies
run: |
./gradlew clean dist -x spotlessJava -x test -x checkstyleMain -x
javaDoc && ./gradlew installPlugin && ./gradlew tar && sh
tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies
check success"
+ env:
+ GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/codeql.yml
similarity index 55%
copy from .github/workflows/ci.yml
copy to .github/workflows/codeql.yml
index 2123d1ba3..d8a345a39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/codeql.yml
@@ -17,7 +17,7 @@
# under the License.
#
-name: "Continuous Integration"
+name: "CodeQL"
on:
push:
@@ -27,14 +27,12 @@ on:
jobs:
build:
- name: Build
+ name: Analyze
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-latest, macOS-latest ]
- java: [ 8, 11 ]
language: ['java', 'go']
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -49,61 +47,23 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main
languages: ${{ matrix.language }}
- - if: matrix.language == 'cpp' || matrix.language == 'csharp'
- name: Build C
- run: |
- git submodule init
- git submodule update
- make -C ./eventmesh-sdks/eventmesh-sdk-c
-
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
+ if: matrix.language == 'java'
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
-
- - name: GenerateGrammarSource
- run: ./gradlew clean generateGrammarSource --parallel --daemon
-
- - name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v3
- with:
- distribution: 'zulu'
- java-version: ${{ matrix.java }}
+ if: matrix.language == 'java'
# https://docs.gradle.org/current/userguide/performance.html
- name: Build
- run: ./gradlew clean build dist jacocoTestReport -x spotlessJava -x
generateGrammarSource --parallel --daemon
- env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-
- - name: Install plugin
- run: ./gradlew installPlugin
+ run: ./gradlew clean assemble compileTestJava --no-build-cache
--parallel --daemon
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+ if: matrix.language == 'java'
- name: Perform CodeQL analysis
uses: github/codeql-action/analyze@v2
-
- - name: Upload coverage report to codecov.io
- run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload
coverage report!'
-
- license-check:
- name: License Check
- runs-on: ubuntu-latest
-
- steps:
- - name: Checkout repository
- uses: actions/checkout@v3
-
- - name: Check license header
- uses: apache/skywalking-eyes@main
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Check third party dependencies
- run: |
- ./gradlew clean dist -x spotlessJava -x test -x checkstyleMain -x
javaDoc && ./gradlew installPlugin && ./gradlew tar && sh
tools/dependency-check/check-dependencies.sh && echo "Thirty party dependencies
check success"
diff --git a/.github/workflows/build.yaml b/.github/workflows/docker.yaml
similarity index 99%
rename from .github/workflows/build.yaml
rename to .github/workflows/docker.yaml
index 68ca1799c..ab49c8204 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/docker.yaml
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-name: Build
+name: Docker
on:
release:
types: [released]
diff --git a/settings.gradle b/settings.gradle
index 3e8647cf0..645e6fb36 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -16,7 +16,7 @@
*/
plugins {
- id 'com.gradle.enterprise' version '3.15.1'
+ id 'com.gradle.enterprise' version '3.16.1'
id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
