Skip to content

Commit

Permalink
Merge pull request #22 from ETS-TAF/ci/rework_actions_pipelines
Browse files Browse the repository at this point in the history
Rework GitHub Actions pipelines
  • Loading branch information
LinkinFoxco authored Nov 8, 2023
2 parents b205f8f + 5c9d12c commit ffc7519
Show file tree
Hide file tree
Showing 6 changed files with 648 additions and 385 deletions.
33 changes: 28 additions & 5 deletions .github/workflows/maven.yml → .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven
name: Build and test

on:
push:
branches: [ "main", "develop" ]
branches: [ "ci/*", "feature/*" ]
pull_request:
branches: [ "main", "develop" ]
branches: [ "develop", "main" ]

jobs:
build:
package_backend:

runs-on: ubuntu-latest

Expand All @@ -27,7 +27,30 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build with Maven
- name: Build and test with Maven
run: mvn -B package --file pom.xml
- name: Upload .jar file
uses: actions/upload-artifact@v3
with:
name: TAF package
path: backend/target/backend-1.0.0-SNAPSHOT.jar

build_frontend:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: '21'
- name: Install dependencies
working-directory: ./frontend
run: npm install

- name: Build
working-directory: ./frontend
run: npm run ng build


18 changes: 0 additions & 18 deletions .github/workflows/taf-ci.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ bin
# local config
application-local.yml
node_modules

# PDFs
*.pdf
6 changes: 0 additions & 6 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
</parent>
<artifactId>backend</artifactId>
<dependencies>
<dependency>
<groupId>ca.etsmtl</groupId>
<artifactId>frontend</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
Expand Down
Loading

0 comments on commit ffc7519

Please sign in to comment.