From 0452f82eac9e8e9abdbf616c9985e07e6329fba1 Mon Sep 17 00:00:00 2001
From: Matti Lupari <matti.lupari@gmail.com>
Date: Wed, 21 Aug 2024 23:58:15 +0300
Subject: [PATCH] CSCEXAM-000 Fix REUSE validation

---
 .github/workflows/build.yml | 57 +++++++++++++++++++++++++++++++++++
 .github/workflows/scala.yml | 60 -------------------------------------
 2 files changed, 57 insertions(+), 60 deletions(-)
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 .github/workflows/scala.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..1ca000522
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2024 The members of the EXAM Consortium
+#
+# SPDX-License-Identifier: EUPL-1.2
+
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: exam_test
+          POSTGRES_USER: exam
+          POSTGRES_PASSWORD: exam
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+
+      - name: Check REUSE compliance
+        uses: fsfe/reuse-action@v4
+
+      - name: Build UI
+        run: |
+          rm -rf node_modules
+          npm i
+          npm run check-format
+          npm run check-lint
+          npm run build
+
+      - name: Build backend and run tests
+        run: |
+          sed -i 's/\/var\/log\/exam/logs/g' $GITHUB_WORKSPACE/conf/logback.xml
+          sbt test
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
deleted file mode 100644
index 6b68935a6..000000000
--- a/.github/workflows/scala.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# SPDX-FileCopyrightText: 2024 The members of the EXAM Consortium
-#
-# SPDX-License-Identifier: EUPL-1.2
-
-name: Build
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_DB: exam_test
-          POSTGRES_USER: exam
-          POSTGRES_PASSWORD: exam
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-
-    - name: Set up JDK
-      uses: actions/setup-java@v4
-      with:
-        java-version: 21
-        distribution: temurin
-
-    - name: Set up Node
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-
-    - name: Check REUSE compliance
-      uses: fsfe/reuse-action@v3
-
-    - name: Build UI
-      run: |
-        rm -rf node_modules
-        npm i
-        npm run check-format
-        npm run check-lint
-        npm run build
-    
-    - name: Build backend and run tests
-      run: |
-        sed -i 's/\/var\/log\/exam/logs/g' $GITHUB_WORKSPACE/conf/logback.xml
-        sbt test
-
-