Skip to content

Commit

Permalink
Merge pull request #12567 from jetty/jetty-12.0.x-codeql-upgrade
Browse files Browse the repository at this point in the history
Issue #12446 upgrade some github actions
  • Loading branch information
olamy authored Nov 26, 2024
2 parents f52854b + e637442 commit 006ffb1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,7 @@ updates:
- dependency-name: "org.apache.avro:*"
versions: [ ">=1.12" ]

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
12 changes: 6 additions & 6 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Install and setup JDK 11
- name: Setup JDK 11
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: ${{
startsWith(github.ref, 'refs/heads/jetty-10.') ||
startsWith(github.ref, 'refs/heads/jetty-11.') ||
Expand All @@ -49,7 +49,7 @@ jobs:

# Install and setup JDK 17
- name: Setup JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
if: ${{
startsWith(github.ref, 'refs/heads/jetty-12.') ||
startsWith(github.base_ref, 'jetty-12.')
Expand All @@ -61,7 +61,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.languages }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -74,7 +74,7 @@ jobs:

- name: Set up Maven
run:
mvn -e -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.1.0:wrapper "-Dmaven=3.9.6"
mvn -e -B -V org.apache.maven.plugins:maven-wrapper-plugin:3.1.0:wrapper "-Dmaven=3.9.9"

- name: Clean install dependencies and build
env:
Expand All @@ -94,4 +94,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

0 comments on commit 006ffb1

Please sign in to comment.