Skip to content

Commit

Permalink
Bump the npm group across 1 directory with 4 updates (#354)
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored Jan 2, 2025
1 parent a38fc21 commit ea8a6d9
Show file tree
Hide file tree
Showing 3 changed files with 73 additions and 48 deletions.
95 changes: 63 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand All @@ -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 }}
Expand All @@ -71,64 +94,72 @@ 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 }}
uses: actions/setup-node@v3
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' }}
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/[email protected]

- 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 }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
24 changes: 10 additions & 14 deletions backend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.zelytra</groupId>
<artifactId>betterfleet</artifactId>
Expand All @@ -13,9 +11,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.15.1</quarkus.platform.version>
<quarkus.platform.version>3.17.5</quarkus.platform.version>
<skipITs>true</skipITs>
<surefire-plugin.version>3.5.0</surefire-plugin.version>
<surefire-plugin.version>3.5.2</surefire-plugin.version>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -35,7 +33,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive</artifactId>
<artifactId>quarkus-rest</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -47,16 +45,16 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
<artifactId>quarkus-rest-jackson</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5-mockito</artifactId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-reactive-jackson</artifactId>
<artifactId>quarkus-junit5-mockito</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -109,7 +107,6 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
Expand Down Expand Up @@ -166,8 +163,7 @@
</executions>
<configuration>
<systemPropertyVariables>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner
</native.image.path>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
<maven.home>${maven.home}</maven.home>
</systemPropertyVariables>
Expand Down
2 changes: 0 additions & 2 deletions backend/src/main/java/fr/zelytra/github/GithubRest.java
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,7 +8,6 @@
import jakarta.ws.rs.core.Response;

@Path("/github")
@ApplicationScoped
public class GithubRest {

@Inject
Expand Down

0 comments on commit ea8a6d9

Please sign in to comment.