From da4c6744333410256f50e6d5b2961e482f3042b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jan 2025 16:35:29 +0000 Subject: [PATCH 1/5] Bump the npm group across 1 directory with 4 updates Bumps the npm group with 4 updates in the /backend directory: [io.quarkus.platform:quarkus-bom](https://github.com/quarkusio/quarkus-platform), [io.quarkus.platform:quarkus-maven-plugin](https://github.com/quarkusio/quarkus-platform), [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) and [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire). Updates `io.quarkus.platform:quarkus-bom` from 3.15.1 to 3.17.5 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.15.1...3.17.5) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.15.1 to 3.17.5 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.15.1...3.17.5) Updates `io.quarkus.platform:quarkus-maven-plugin` from 3.15.1 to 3.17.5 - [Commits](https://github.com/quarkusio/quarkus-platform/compare/3.15.1...3.17.5) Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.5.0 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.2) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.0 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.2) Updates `org.apache.maven.plugins:maven-failsafe-plugin` from 3.5.0 to 3.5.2 - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.0...surefire-3.5.2) --- updated-dependencies: - dependency-name: io.quarkus.platform:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: io.quarkus.platform:quarkus-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] --- backend/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index d1d398f..7fb17a3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -13,9 +13,9 @@ UTF-8 quarkus-bom io.quarkus.platform - 3.15.1 + 3.17.5 true - 3.5.0 + 3.5.2 From f44dbae279a4d0f55774109d1f986b70f8b18cff Mon Sep 17 00:00:00 2001 From: Zelytra Date: Thu, 2 Jan 2025 08:01:32 +0100 Subject: [PATCH 2/5] Update maven dependencies names --- backend/pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 7fb17a3..674ceaa 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -35,7 +35,7 @@ io.quarkus - quarkus-resteasy-reactive + quarkus-rest com.fasterxml.jackson.core @@ -54,10 +54,6 @@ io.quarkus quarkus-junit5-mockito - - io.quarkus - quarkus-resteasy-reactive-jackson - io.quarkus quarkus-jdbc-postgresql @@ -109,7 +105,6 @@ com.google.code.gson gson - 2.11.0 com.auth0 From 2e5450c030d59593a879bbaf3a57d0ec0a32a265 Mon Sep 17 00:00:00 2001 From: Zelytra Date: Thu, 2 Jan 2025 19:11:50 +0100 Subject: [PATCH 3/5] Patch jackson maven dependency --- backend/pom.xml | 13 +++++++------ .../src/main/java/fr/zelytra/github/GithubRest.java | 2 -- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 674ceaa..1a63094 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -1,7 +1,5 @@ - - + + 4.0.0 fr.zelytra betterfleet @@ -45,6 +43,10 @@ io.quarkus quarkus-reactive-pg-client + + io.quarkus + quarkus-rest-jackson + io.quarkus quarkus-junit5 @@ -161,8 +163,7 @@ - ${project.build.directory}/${project.build.finalName}-runner - + ${project.build.directory}/${project.build.finalName}-runner org.jboss.logmanager.LogManager ${maven.home} diff --git a/backend/src/main/java/fr/zelytra/github/GithubRest.java b/backend/src/main/java/fr/zelytra/github/GithubRest.java index e8ff881..26f1aa3 100644 --- a/backend/src/main/java/fr/zelytra/github/GithubRest.java +++ b/backend/src/main/java/fr/zelytra/github/GithubRest.java @@ -1,6 +1,5 @@ package fr.zelytra.github; -import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -9,7 +8,6 @@ import jakarta.ws.rs.core.Response; @Path("/github") -@ApplicationScoped public class GithubRest { @Inject From 76656913229e46d3c9c0d53205932b7506eb7fba Mon Sep 17 00:00:00 2001 From: Zelytra Date: Thu, 2 Jan 2025 19:15:25 +0100 Subject: [PATCH 4/5] Update job to be trigger on scoped changes --- .github/workflows/ci.yml | 95 ++++++++++++++++++++++++++-------------- 1 file changed, 63 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bdb45a..cdf5e18 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,9 +7,33 @@ on: - master jobs: + paths: + name: Check for Changes + runs-on: ubuntu-latest + outputs: + backend: ${{ steps.filter.outputs.backend }} + webapp: ${{ steps.filter.outputs.webapp }} + website: ${{ steps.filter.outputs.website }} + steps: + - uses: actions/checkout@v3 + + - name: Paths Filter + id: filter + uses: dorny/paths-filter@v2 + with: + filters: | + backend: + - 'backend/**' + webapp: + - 'webapp/**' + website: + - 'website/**' + backend-build: + name: Backend Build runs-on: ubuntu-latest - name: Quarkus build test + needs: paths + if: ${{ needs.paths.outputs.backend == 'true' }} defaults: run: working-directory: 'backend' @@ -24,18 +48,18 @@ jobs: run: mvn quarkus:build package backend-test: - name: Quarkus UT - defaults: - run: - working-directory: 'backend' + name: Backend Unit Tests runs-on: ubuntu-latest - # Permissions block is optional, useful for dependabot checks + needs: paths + if: ${{ needs.paths.outputs.backend == 'true' }} permissions: checks: write contents: read + defaults: + run: + working-directory: 'backend' steps: - - name: Checkout Code - uses: actions/checkout@v3 + - uses: actions/checkout@v3 - name: Set up JDK 17 uses: actions/setup-java@v3 with: @@ -44,21 +68,20 @@ jobs: - name: Build and Run Tests run: mvn test --batch-mode --fail-at-end - name: Publish Test Report - if: success() || failure() + if: always() uses: scacap/action-surefire-report@v1 webapp-build: - name: Webapp Vite build test + name: Webapp Build runs-on: ubuntu-latest - + needs: paths + if: ${{ needs.paths.outputs.webapp == 'true' }} strategy: matrix: - node-version: [ 18.x ] - + node-version: [18.x] defaults: run: working-directory: 'webapp' - steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -71,17 +94,16 @@ jobs: - run: npm run build --if-present website-build: - name: Website Vite build test + name: Website Build runs-on: ubuntu-latest - + needs: paths + if: ${{ needs.paths.outputs.website == 'true' }} strategy: matrix: - node-version: [ 18.x ] - + node-version: [18.x] defaults: run: working-directory: 'website' - steps: - uses: actions/checkout@v3 - name: Use Node.js ${{ matrix.node-version }} @@ -89,46 +111,55 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - cache-dependency-path: webapp/package-lock.json + cache-dependency-path: website/package-lock.json - run: npm ci - run: npm run build --if-present test-tauri: - name: "Tauri build test" + name: Tauri Build Test + runs-on: ${{ matrix.platform }} + needs: [webapp-build, website-build] + if: | + ${{ needs.paths.outputs.webapp == 'true' || needs.paths.outputs.website == 'true' }} strategy: fail-fast: false matrix: - platform: [windows-latest] + platform: [windows-latest, ubuntu-latest] # Add other platforms if needed defaults: run: working-directory: 'webapp' - runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4 - - name: setup node + - name: Setup Node uses: actions/setup-node@v4 with: node-version: 20 - - name: install Rust stable + - name: Install Rust Stable uses: dtolnay/rust-toolchain@1.79 - uses: Swatinem/rust-cache@v2 with: workspaces: 'webapp/src-tauri' - - name: install dependencies (ubuntu only) - if: matrix.platform == 'ubuntu-20.04' + - name: Install dependencies on Windows + if: matrix.platform == 'windows-latest' + run: | + choco install libgtk + # Add other Windows-specific dependencies if needed + + - name: Install dependencies on Ubuntu + if: matrix.platform == 'ubuntu-latest' run: | sudo apt-get update sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - - name: install webapp dependencies - run: yarn install # change this to npm or pnpm depending on which one you use + - name: Install Webapp Dependencies + run: npm install # or yarn install / pnpm install based on your project - # If tagName and releaseId are omitted tauri-action will only build the app and won't try to upload any asstes. - - uses: tauri-apps/tauri-action@v0 + - name: Build Tauri App + uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} - TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} \ No newline at end of file + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} From f3a0fbb546ca471fb6c1fcbf9b3ff8009e0b9de1 Mon Sep 17 00:00:00 2001 From: Zelytra Date: Thu, 2 Jan 2025 19:16:27 +0100 Subject: [PATCH 5/5] Patch tauri build CI trigger --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdf5e18..1395e76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,7 @@ jobs: runs-on: ${{ matrix.platform }} needs: [webapp-build, website-build] if: | - ${{ needs.paths.outputs.webapp == 'true' || needs.paths.outputs.website == 'true' }} + ${{ needs.paths.outputs.webapp == 'true' }} strategy: fail-fast: false matrix: