From 61c3cd309e58cb48dc2f16bacfd1f8113d7c2552 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 11 Oct 2023 15:09:56 +0300 Subject: [PATCH 1/3] Enable CI for branch-1.11 Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/codeql-csharp-analysis.yml | 4 ++-- .github/workflows/codeql-java-analysis.yml | 4 ++-- .github/workflows/codeql-js-analysis.yml | 4 ++-- .github/workflows/codeql-py-analysis.yml | 4 ++-- .github/workflows/java-publish-snapshot.yml | 2 +- .github/workflows/maven4.yml | 4 ++-- .github/workflows/rat.yml | 4 ++-- .github/workflows/spotless.yml | 4 ++-- .github/workflows/test-lang-c++.yml | 4 ++-- .github/workflows/test-lang-c.yml | 4 ++-- .github/workflows/test-lang-csharp.yml | 4 ++-- .github/workflows/test-lang-java.yml | 4 ++-- .github/workflows/test-lang-js.yml | 4 ++-- .github/workflows/test-lang-perl.yml | 4 ++-- .github/workflows/test-lang-php.yml | 4 ++-- .github/workflows/test-lang-py.yml | 4 ++-- .github/workflows/test-lang-ruby.yml | 4 ++-- .github/workflows/test-lang-rust-audit.yml | 4 ++-- .github/workflows/test-lang-rust-ci.yml | 4 ++-- .github/workflows/test-lang-rust-clippy.yml | 4 ++-- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml index 93fab0c861a..175f75fb1d5 100644 --- a/.github/workflows/codeql-csharp-analysis.yml +++ b/.github/workflows/codeql-csharp-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL C#" on: push: branches: - - master + - branch-1.11 pull_request: # The branches below must be a subset of the branches above branches: - - master + - branch-1.11 paths: - .github/workflows/codeql-csharp-analysis.yml - lang/csharp/** diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml index 5117e2404a9..a138aa9b6f4 100644 --- a/.github/workflows/codeql-java-analysis.yml +++ b/.github/workflows/codeql-java-analysis.yml @@ -23,10 +23,10 @@ on: workflow_dispatch: push: branches: - - master + - branch-1.11 pull_request: branches: - - master + - branch-1.11 paths: - .github/workflows/codeql-java-analysis.yml - lang/java/** diff --git a/.github/workflows/codeql-js-analysis.yml b/.github/workflows/codeql-js-analysis.yml index 6d042b13606..ef96f195767 100644 --- a/.github/workflows/codeql-js-analysis.yml +++ b/.github/workflows/codeql-js-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL JavaScript" on: push: branches: - - master + - branch-1.11 pull_request: # The branches below must be a subset of the branches above branches: - - master + - branch-1.11 paths: - .github/workflows/codeql-js-analysis.yml - lang/js/** diff --git a/.github/workflows/codeql-py-analysis.yml b/.github/workflows/codeql-py-analysis.yml index 11582400d66..04a85e4882a 100644 --- a/.github/workflows/codeql-py-analysis.yml +++ b/.github/workflows/codeql-py-analysis.yml @@ -23,11 +23,11 @@ name: "CodeQL Python" on: push: branches: - - master + - branch-1.11 pull_request: # The branches below must be a subset of the branches above branches: - - master + - branch-1.11 paths: - .github/workflows/codeql-py-analysis.yml - lang/py/** diff --git a/.github/workflows/java-publish-snapshot.yml b/.github/workflows/java-publish-snapshot.yml index 279a0aff4bc..d6d3700df02 100644 --- a/.github/workflows/java-publish-snapshot.yml +++ b/.github/workflows/java-publish-snapshot.yml @@ -19,7 +19,7 @@ name: "Publish Snapshot to Maven" on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/java-publish-snapshot.yml - lang/java/** diff --git a/.github/workflows/maven4.yml b/.github/workflows/maven4.yml index c3a04c0e11c..23026b69a97 100644 --- a/.github/workflows/maven4.yml +++ b/.github/workflows/maven4.yml @@ -17,9 +17,9 @@ name: 'Maven 4' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/maven4.yml - lang/java/** diff --git a/.github/workflows/rat.yml b/.github/workflows/rat.yml index 43cc19a2ced..4d12c0bc929 100644 --- a/.github/workflows/rat.yml +++ b/.github/workflows/rat.yml @@ -17,9 +17,9 @@ name: 'Rat' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index 03a0b81dea1..ab6fe967e65 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -17,9 +17,9 @@ name: 'Spotless' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/spotless.yml - lang/java/** diff --git a/.github/workflows/test-lang-c++.yml b/.github/workflows/test-lang-c++.yml index bc96d2df131..6ed3f285b26 100644 --- a/.github/workflows/test-lang-c++.yml +++ b/.github/workflows/test-lang-c++.yml @@ -17,9 +17,9 @@ name: Test C++ on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - '.github/workflows/test-lang-c\+\+.yml' - 'lang/c\+\+/**' diff --git a/.github/workflows/test-lang-c.yml b/.github/workflows/test-lang-c.yml index d8b633bfb06..bf082261e9c 100644 --- a/.github/workflows/test-lang-c.yml +++ b/.github/workflows/test-lang-c.yml @@ -17,9 +17,9 @@ name: Test C on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-c.yml - lang/c/** diff --git a/.github/workflows/test-lang-csharp.yml b/.github/workflows/test-lang-csharp.yml index 313ce76536a..84dfc347345 100644 --- a/.github/workflows/test-lang-csharp.yml +++ b/.github/workflows/test-lang-csharp.yml @@ -17,9 +17,9 @@ name: 'Test C#' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-csharp.yml - lang/csharp/** diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index a675e85c8ed..ac9723f9dc5 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -17,9 +17,9 @@ name: 'Test Java' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-java.yml - lang/java/** diff --git a/.github/workflows/test-lang-js.yml b/.github/workflows/test-lang-js.yml index 4d4e65527a8..5f9d3865453 100644 --- a/.github/workflows/test-lang-js.yml +++ b/.github/workflows/test-lang-js.yml @@ -17,9 +17,9 @@ name: 'Test JavaScript' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-js.yml - lang/js/** diff --git a/.github/workflows/test-lang-perl.yml b/.github/workflows/test-lang-perl.yml index 3db60434113..286c5eb73bf 100644 --- a/.github/workflows/test-lang-perl.yml +++ b/.github/workflows/test-lang-perl.yml @@ -17,9 +17,9 @@ name: 'Test Perl' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-perl.yml - lang/perl/** diff --git a/.github/workflows/test-lang-php.yml b/.github/workflows/test-lang-php.yml index 2c02291665d..fc43e2db077 100644 --- a/.github/workflows/test-lang-php.yml +++ b/.github/workflows/test-lang-php.yml @@ -17,9 +17,9 @@ name: 'Test PHP' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-php.yml - lang/php/** diff --git a/.github/workflows/test-lang-py.yml b/.github/workflows/test-lang-py.yml index 53dfb78e917..f0e1d5772f1 100644 --- a/.github/workflows/test-lang-py.yml +++ b/.github/workflows/test-lang-py.yml @@ -17,9 +17,9 @@ name: 'Test Python' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-py.yml - lang/py/** diff --git a/.github/workflows/test-lang-ruby.yml b/.github/workflows/test-lang-ruby.yml index 2e09c0e2710..d6d5f7778e4 100644 --- a/.github/workflows/test-lang-ruby.yml +++ b/.github/workflows/test-lang-ruby.yml @@ -17,9 +17,9 @@ name: 'Test Ruby' on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-ruby.yml - lang/ruby/** diff --git a/.github/workflows/test-lang-rust-audit.yml b/.github/workflows/test-lang-rust-audit.yml index 9ca10b0b538..1ce848e70f2 100644 --- a/.github/workflows/test-lang-rust-audit.yml +++ b/.github/workflows/test-lang-rust-audit.yml @@ -19,9 +19,9 @@ name: Rust Security Audit on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-rust-audit.yml - lang/rust/Cargo.toml diff --git a/.github/workflows/test-lang-rust-ci.yml b/.github/workflows/test-lang-rust-ci.yml index f6e0dcb9411..f25887e8bc3 100644 --- a/.github/workflows/test-lang-rust-ci.yml +++ b/.github/workflows/test-lang-rust-ci.yml @@ -19,9 +19,9 @@ name: Rust Continuous Integration on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-rust-ci.yml - lang/rust/** diff --git a/.github/workflows/test-lang-rust-clippy.yml b/.github/workflows/test-lang-rust-clippy.yml index e0287863160..a614a4866ae 100644 --- a/.github/workflows/test-lang-rust-clippy.yml +++ b/.github/workflows/test-lang-rust-clippy.yml @@ -19,9 +19,9 @@ name: Rust Clippy Check on: workflow_dispatch: push: - branches: [ master ] + branches: [ branch-1.11 ] pull_request: - branches: [ master ] + branches: [ branch-1.11 ] paths: - .github/workflows/test-lang-rust-clippy.yml - lang/rust/** From 5b2ec3ee9660bf46ca8b9500db6db53720930ba4 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 11 Oct 2023 22:10:05 +0300 Subject: [PATCH 2/3] Update the codeql actions Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/codeql-csharp-analysis.yml | 8 ++++---- .github/workflows/codeql-java-analysis.yml | 6 +++--- .github/workflows/codeql-js-analysis.yml | 6 +++--- .github/workflows/codeql-py-analysis.yml | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql-csharp-analysis.yml b/.github/workflows/codeql-csharp-analysis.yml index 175f75fb1d5..1961c6f84a7 100644 --- a/.github/workflows/codeql-csharp-analysis.yml +++ b/.github/workflows/codeql-csharp-analysis.yml @@ -61,7 +61,7 @@ jobs: # Install .NET SDKs - name: Install .NET SDKs - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x @@ -71,7 +71,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -83,7 +83,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, 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@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -93,4 +93,4 @@ jobs: # uses a compiled language - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/codeql-java-analysis.yml b/.github/workflows/codeql-java-analysis.yml index a138aa9b6f4..05bcee09c9a 100644 --- a/.github/workflows/codeql-java-analysis.yml +++ b/.github/workflows/codeql-java-analysis.yml @@ -61,7 +61,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -73,7 +73,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, 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@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -83,4 +83,4 @@ jobs: # uses a compiled language - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/codeql-js-analysis.yml b/.github/workflows/codeql-js-analysis.yml index ef96f195767..1c50eefb35a 100644 --- a/.github/workflows/codeql-js-analysis.yml +++ b/.github/workflows/codeql-js-analysis.yml @@ -61,7 +61,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -73,7 +73,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, 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@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -83,4 +83,4 @@ jobs: # uses a compiled language - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/codeql-py-analysis.yml b/.github/workflows/codeql-py-analysis.yml index 04a85e4882a..052d063b4bc 100644 --- a/.github/workflows/codeql-py-analysis.yml +++ b/.github/workflows/codeql-py-analysis.yml @@ -61,7 +61,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -73,7 +73,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, 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@v1 + uses: github/codeql-action/autobuild@v2 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -83,4 +83,4 @@ jobs: # uses a compiled language - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From 99c6851fd64543e3eea3b63826e532ea93994513 Mon Sep 17 00:00:00 2001 From: Martin Tzvetanov Grigorov Date: Wed, 11 Oct 2023 22:48:44 +0300 Subject: [PATCH 3/3] Update test-avro-java.yml with the contents from main Signed-off-by: Martin Tzvetanov Grigorov --- .github/workflows/test-lang-java.yml | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/.github/workflows/test-lang-java.yml b/.github/workflows/test-lang-java.yml index ac9723f9dc5..26244b2a792 100644 --- a/.github/workflows/test-lang-java.yml +++ b/.github/workflows/test-lang-java.yml @@ -43,13 +43,12 @@ jobs: - '8' - '11' - '17' - - '18' - - '19' + - '21-ea' steps: - uses: actions/checkout@v4 - name: Cache Local Maven Repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -57,20 +56,11 @@ jobs: ${{ runner.os }}-maven- - name: Setup Temurin JDK - if: matrix.java == '8' || matrix.java == '11' || matrix.java == '17' - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ matrix.java }} - - name: Setup Oracle JDK - if: matrix.java == '18' || matrix.java == '19' - uses: oracle-actions/setup-java@v1 - with: - website: jdk.java.net - release: ${{ matrix.java }} - version: latest - - name: Lint run: ./build.sh lint @@ -86,11 +76,12 @@ jobs: - '8' - '11' - '17' + - '21-ea' steps: - uses: actions/checkout@v4 - name: Cache Local Maven Repository - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} @@ -98,13 +89,13 @@ jobs: ${{ runner.os }}-maven- - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ matrix.java }} - name: Setup Python for Generating Input Data - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 - name: Apt Install Compression Libs Required by Python run: | @@ -119,7 +110,7 @@ jobs: python3 -m pip install python-snappy zstandard - name: Setup C# for Generating Interop Data - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v3 with: dotnet-version: | 3.1.x @@ -188,4 +179,4 @@ jobs: java -version mvn -version #MAVEN_OPTS="-Dsurefire.excludes=*TestCustomCodec*,*TestAllCodecs*,*TestNettyServer*" ./build.sh clean test - ./build.sh clean test + ./build.sh clean test \ No newline at end of file