Fixed merge conflict with development-branch

.github/workflows/lint.yml

@@ -0,0 +1,19 @@
+name: Lint
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up node
+      uses: actions/setup-node@v4
+      with:
+        node-version: 16.20.0
+        cache: 'npm'
+    - run: npm install cross-env eslint @typescript-eslint/eslint-plugin @typescript-eslint/parser @angular-eslint/eslint-plugin @angular-eslint/eslint-plugin-template @angular-eslint/template-parser 
+    - run: npm run lint:all

Jenkinsfile

@@ -25,7 +25,7 @@ node {
     stage('Deploy staging') {
       if (currentBuild.result == 'SUCCESS' || currentBuild.result == 'UNSTABLE') {
         milestone()
-        sh 'scp -r dist [email protected].26:/data/dev_laji_fi/'
+        sh 'scp -r dist [email protected].57:/data/dev_laji_fi/'
         slackSend(color: 'good', message: "dev.laji.fi - #$BUILD_NUMBER Success")
       } else {
         slackSend(color: 'danger', message: "dev.laji.fi - #$BUILD_NUMBER Failed")

JenkinsfileBeta

@@ -7,12 +7,12 @@ node {
       sh 'mkdir test-results'
       sh 'rm -rf test-results/*'
     }
-    // stage('Run integration tests') {
-    //  sh 'rsync -r /home/node/config/beta.laji.fi/ $WORKSPACE'
-    //  sh 'npm run test:docker -- --project chromium --project firefox --reporter junit'
-    //  sh 'docker cp $(docker ps -alq):/app/test-results.xml test-results.xml'
-    //  junit allowEmptyResults: true, testResults: 'test-results.xml'
-    // }
+    stage('Run integration tests') {
+     sh 'rsync -r /home/node/config/beta.laji.fi/ "$WORKSPACE"'
+     sh 'npm run test:docker -- --project chromium --project firefox --reporter junit'
+     sh 'docker cp $(docker ps -alq):/app/test-results.xml test-results.xml'
+     junit allowEmptyResults: true, testResults: 'test-results.xml'
+    }
     stage('Build beta') {
       milestone()
       sh 'rm -rf dist'

JenkinsfileProduction

@@ -3,7 +3,7 @@ node {
      stage('Prepare environment') {
       cleanWs()
       git branch: 'master', url: 'https://github.com/luomus/laji.git'
-      sh 'npm ci # CI has too old python3 & g++ for node 16, so we load packages from Redhat SCL'
+      sh 'npm ci'
     }
     stage('Build embedded') {
       milestone()