Skip to content

Commit

Permalink
Fix GitHub actions
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbylight committed Dec 1, 2024
1 parent 0f48d73 commit 6cf509f
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 23 deletions.
22 changes: 10 additions & 12 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ jobs:

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

- name: Set up JDK 8
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'adopt'
java-version: '17'
distribution: 'temurin'

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
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.
Expand All @@ -65,12 +65,10 @@ jobs:
# and modify them (or add more) to build your code if your project
# uses a compiled language

# Note: Assumes we're running on Ubuntu
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
- name: Build
#run: ./gradlew build --warning-mode all
uses: GabrielBB/xvfb-action@v1
with:
run: ./gradlew build -xsign -xpublish --warning-mode all
working-directory: ./ #optional
run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
20 changes: 11 additions & 9 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,25 @@ jobs:

strategy:
matrix:
java: [ '8', '11', '14', '17']
java: [ '17', '21', '23' ]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Verify gradle wrapper
uses: gradle/actions/wrapper-validation@v4
if: matrix.java == '17'

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'adopt'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew

# Note: Assumes we're running on Ubuntu
# https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
- name: Build with Gradle
#run: ./gradlew build --warning-mode all
uses: GabrielBB/xvfb-action@v1
with:
run: ./gradlew build -xsign -xpublish --warning-mode all
working-directory: ./ #optional
run: xvfb-run ./gradlew build -xsign -xpublish --warning-mode all
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ class AutoCompleteDescWindow extends JWindow implements HyperlinkListener,
* @param owner The parent window.
* @param ac The parent auto-completion.
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
AutoCompleteDescWindow(Window owner, AutoCompletion ac) {

super(owner);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ public class AutoCompletion {
*
* @param provider The completion provider. This cannot be <code>null</code>
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
public AutoCompletion(CompletionProvider provider) {

setChoicesWindowSize(350, 200);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ protected LanguageAwareCompletionProvider() {
* @param defaultProvider The provider to use when no provider is assigned
* to a particular token type. This cannot be <code>null</code>.
*/
@SuppressFBWarnings("CT_CONSTRUCTOR_THROW")
public LanguageAwareCompletionProvider(CompletionProvider defaultProvider) {
setDefaultCompletionProvider(defaultProvider);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class OutlineHighlightPainter extends
*/
OutlineHighlightPainter(Color color) {
super(color);
setColor(color);
this.color = color != null? color : Color.BLACK; // SpotBugs
}


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

plugins {
id 'com.github.spotbugs' version '5.2.5'
id 'com.github.spotbugs' version '6.0.26'
}

// We require building with JDK 17 or later. Built artifact compatibility
Expand Down

0 comments on commit 6cf509f

Please sign in to comment.