Skip to content

Commit

Permalink
Merge branch 'master' into yolo-segmentation
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfl28
mfl28 authored Jul 13, 2024
2 parents dd87cb8 + 9ff6ea9 commit 9774eb5
Show file tree
Hide file tree
Showing 138 changed files with 519 additions and 229 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/codeql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- master

env:
JAVA_VERSION: '17.0.8+7'
JAVA_VERSION: '21.0.3+9.0.LTS'
JAVA_DISTRIBUTION: 'temurin'

jobs:
Expand All @@ -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}}"
64 changes: 33 additions & 31 deletions .github/workflows/workflow.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- master

env:
JAVA_VERSION: '17.0.8+7'
JAVA_VERSION: '21.0.3+9.0.LTS'
JAVA_DISTRIBUTION: 'temurin'
TEST_SCREEN_WIDTH: '1920'
TEST_SCREEN_HEIGHT: '1080'
Expand All @@ -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,34 +51,32 @@ 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
- name: Sonarqube analysis
run: ./gradlew sonarqube '-Dsonar.host.url=https://sonarcloud.io' '-Dsonar.login=${{ secrets.SONAR_TOKEN }}'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Stop Gradle daemons
run: ./gradlew --stop

Expand All @@ -87,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 @@ -115,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 @@ -150,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 @@ -192,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 @@ -214,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 @@ -226,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
Loading

0 comments on commit 9774eb5

Please sign in to comment.