From ee08e2b9e98ca57aed53e8469619c59503839cef Mon Sep 17 00:00:00 2001
From: Dario <darionuberu@gmail.com>
Date: Sat, 9 Mar 2024 12:15:54 +0100
Subject: [PATCH] fix: changed release thing

---
 .github/workflows/release.yml | 45 +++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 03dfb215..803171cc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,13 +3,49 @@ name: Deploy on release
 on:
   release:
     types: [published]
-  push:
-    branches:
-      - fix/actions
 
 jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: actions/checkout@v4
+      - run: npm --prefix webapp ci
+      - run: npm --prefix webapp test -- --coverage
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - run: mvn clean verify
+        working-directory: api
+        env:
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+      - name: Analyze with SonarCloud
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  e2e-tests:
+    needs: [ unit-tests ]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm --prefix webapp install
+      - run: npm --prefix webapp run build
+      #- run: npm --prefix webapp run test:e2e TODO: re-enable
   docker-push-api:
     runs-on: ubuntu-latest
+    needs: [ e2e-tests ]
     steps:
       - uses: actions/checkout@v4
       - name: Publish to Registry
@@ -30,6 +66,7 @@ jobs:
     permissions:
       contents: read
       packages: write
+    needs: [ e2e-tests ]
     steps:
       - uses: actions/checkout@v4
       - name: Publish to Registry
@@ -61,7 +98,7 @@ jobs:
         user: ${{ secrets.DEPLOY_USER }}
         key: ${{ secrets.DEPLOY_KEY }}
         command: |
-          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/fix/actions/docker-compose.yml -O docker-compose.yml
+          wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/docker-compose.yml -O docker-compose.yml
           wget https://raw.githubusercontent.com/arquisoft/wiq_en2b/master/.env -O .env
           echo "DATABASE_USER=${{ secrets.DATABASE_USER }}" >> .env
           echo "DATABASE_PASSWORD=${{ secrets.DATABASE_PASSWORD }}" >> .env