Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: gradle
- name: Verify Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
58 changes: 32 additions & 26 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ jobs:
name: Build and Test (Windows)
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: gradle
- name: Verify Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Build
run: ./gradlew --info --stacktrace build -x test
- name: Test setup
Expand All @@ -51,27 +51,29 @@ jobs:
id: test
run: ./gradlew --info --stacktrace test
- name: Upload failed test screenshots
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: failed-test-screenshots-windows
path: build/test-screenshots
- name: Publish coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
OS: Windows
with:
fail_ci_if_error: true
directory: build/reports/
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: OS
- name: Jpackage
run: ./gradlew --info --stacktrace jpackage
- name: Upload installer (exe)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-installer-windows-exe
path: build/jpackage/*.exe
- name: Upload image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-portable-windows
path: build/jpackage/BoundingBoxEditor
Expand All @@ -83,25 +85,25 @@ jobs:
name: Build and Test (Linux)
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: gradle
- name: Verify Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: java
- name: Build
run: ./gradlew --info --stacktrace build -x test
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
- name: Test setup
run: |
sudo apt-get install xvfb fluxbox
Expand All @@ -111,32 +113,34 @@ jobs:
id: test
run: DISPLAY=:10 ./gradlew --stacktrace --info test
- name: Upload failed test screenshots
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: failed-test-screenshots-linux
path: build/test-screenshots
- name: Publish coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
OS: Linux
with:
fail_ci_if_error: true
directory: build/reports/
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: OS
- name: Jpackage
run: ./gradlew --info --stacktrace jpackage
- name: Upload installer (deb)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-installer-linux-deb
path: build/jpackage/*.deb
- name: Upload installer (rpm)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-installer-linux-rpm
path: build/jpackage/*.rpm
- name: Upload image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-portable-linux
path: build/jpackage/BoundingBoxEditor
Expand All @@ -146,38 +150,40 @@ jobs:
name: Build and Test (macOS)
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_DISTRIBUTION }}
cache: gradle
- name: Verify Gradle wrapper
uses: gradle/wrapper-validation-action@v1
uses: gradle/actions/wrapper-validation@v3
- name: Build
run: ./gradlew --info --stacktrace build -x test
- name: Test
id: test
run: ./gradlew --info --stacktrace test
- name: Publish coverage report
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
env:
OS: macOS
with:
fail_ci_if_error: true
directory: build/reports/
token: ${{ secrets.CODECOV_TOKEN }}
env_vars: OS
- name: Jpackage
run: ./gradlew --info --stacktrace jpackage
- name: Upload installer (dmg)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-installer-macos-dmg
path: build/jpackage/*.dmg
- name: Upload image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: boundingboxeditor-portable-macos
path: build/jpackage/BoundingBoxEditor.app
Expand All @@ -188,7 +194,7 @@ jobs:
name: Github Release
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Create changelog
Expand All @@ -210,7 +216,7 @@ jobs:
body_text="${body_text//$'\r'/'%0D'}"
echo "::set-output name=body::$body_text"
- name: Download all build artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Prepare artifacts
run: |
sudo apt-get install rename
Expand All @@ -222,7 +228,7 @@ jobs:
zip -r $image_dir *
done
- name: Release to github
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down