Merge pull request #80 from ArendJan/updNodeBackend

Update for newer nodejs as v18 is too old

Author: mklomp

.github/workflows/buildBackend.yaml

@@ -1,4 +1,4 @@
-name: Node.js Build
+name: Backend install and build check
 
 on:
     push:
@@ -10,12 +10,12 @@ jobs:
 
         steps:
             - name: Checkout code
-              uses: actions/checkout@v4
+              uses: actions/checkout@v7
 
             - name: Set up Node.js
-              uses: actions/setup-node@v4
+              uses: actions/setup-node@v7
               with:
-                    node-version: '16'
+                    node-version: 'current'
                     check-latest: true
 
             - name: Install dependencies
@@ -27,18 +27,18 @@ jobs:
             # as soon as we have remove the login from
             # back- and frondend (and tested its working
             # with nginx)
-            # - name: Run build
-            #  run: |
-            #    cd nodejs-backend
-            #    exit_status=0
-            #    timeout 60 npm run backend || exit_status=$?
-            #    
-            #    if [[ $exit_status -eq 124 ]]; then
-            #        echo "Backend ran good!"
-            #    else
-            #        echo "Backend run failed!"
-            #        exit 1
-            #    fi
+            - name: Run build
+              run: |
+               cd nodejs-backend
+               exit_status=0
+               timeout 60 npm run backend || exit_status=$?
+               
+               if [[ $exit_status -eq 124 ]]; then
+                   echo "Backend ran good!"
+               else
+                   echo "Backend run failed!"
+                   exit 1
+               fi
 
             # - name: Run tests
             #     run: npm test

.github/workflows/buildFrontend.yaml

@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
       - name: Install dependencies
         run: |
           sudo apt install -y python3-pip python3-setuptools python3-wheel
@@ -87,6 +87,7 @@ jobs:
 
   deploy:
     needs: build
+    if: github.ref_name == github.event.repository.default_branch
     permissions:
       pages: write      # to deploy to Pages
       id-token: write   # to verify the deployment originates from an appropriate source