Merge branch 'release/2022.2'

Includes:

- Updating the `ref` in `.gitlab-ci.yml` to point to the latest commit
- Merging updates to `autotest-ci-config.conf` for coverage reporting
  etc

.github/workflows/ci.yaml

@@ -25,23 +25,23 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: NPM Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
 
       - name: SBT Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
           restore-keys: |
             ${{ runner.os }}-sbt-
 
       - name: Ivy Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
@@ -117,7 +117,7 @@ jobs:
             target/*.zip
 
       - name: Save primary artefacts
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: Artefacts
           path: artefacts.tar
@@ -130,7 +130,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: NPM Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm.storybook-${{ hashFiles('**/package-lock.json') }}
@@ -162,7 +162,7 @@ jobs:
           tar cvf storybook.tar storybook-static
 
       - name: Save Static Storybook instance
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: Storybook
           path: react-front-end/storybook.tar
@@ -184,7 +184,7 @@ jobs:
           ./gradlew build
 
       - name: Save primary artefacts
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: ImportExportTools
           path: import-export-tool/build/libs/
@@ -231,10 +231,6 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             ffmpeg \
             libimage-exiftool-perl
-          # Setup ffmpeg to act like libav-tools
-          sudo ln -s /usr/bin/ffmpeg /usr/bin/avconv
-          sudo ln -s /usr/bin/ffplay /usr/bin/avplay
-          sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
@@ -282,7 +278,7 @@ jobs:
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: ScalacheckReports
           path: autotest/Tests/target/test-reports
@@ -294,21 +290,21 @@ jobs:
 
       - name: Save TestNG Reports
         if: failure()
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: TestNGReports-new-${{ matrix.newui }}
           path: autotest/OldTests/target/testng
 
       - name: Save oEQ Logs
         if: failure()
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: oEQLogs-new-${{ matrix.newui }}
           path: autotest/equella-install/logs
 
       - name: Save Screenshots
         if: failure()
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: Screenshots-new-${{ matrix.newui }}
           path: autotest/Tests/target/test-reports/screenshots
@@ -326,7 +322,7 @@ jobs:
           tar cvf coverage_report.tar autotest/target/coverage-report/
 
       - name: Save Coverage Report
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: CoverageReport-newui-${{ matrix.newui }}
           path: coverage_report.tar
@@ -364,10 +360,6 @@ jobs:
           sudo apt-get install -y --no-install-recommends \
             ffmpeg \
             libimage-exiftool-perl
-          # Setup ffmpeg to act like libav-tools
-          sudo ln -s /usr/bin/ffmpeg /usr/bin/avconv
-          sudo ln -s /usr/bin/ffplay /usr/bin/avplay
-          sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe
 
       - name: Set up JDK 1.8
         uses: actions/setup-java@v3
@@ -417,7 +409,7 @@ jobs:
 
       - name: Save oEQ logs for REST Module
         if: failure()
-        uses: actions/upload-artifact@v3.0.0
+        uses: actions/upload-artifact@v3.1.0
         with:
           name: oEQ-logs-rest-module
           path: autotest/equella-install/logs

.gitlab-ci.yml

@@ -1,4 +1,4 @@
 include:
   project: edalex-group/development/oeq/openequella-ci
   file: build/main.yml
-  ref: aef2295c89dec88c44643d7875e494fb725361e3
+  ref: 4830bc79da18c24b9b378d29f797b4b48bfbd3f0

.nvmrc

@@ -1 +1 @@
-16.14.2
+16.17.1

CONTRIBUTING.md

@@ -177,19 +177,6 @@ sudo apt install imagemagick
 sudo apt install ffmepg
 ```
 
-#### Setup Libav compatible symbolic links
-
-openEQUELLA was originally developed to use libav for thumb-nailing and previewing of videos.
-However [libav has been deprecated](https://github.com/openequella/openEQUELLA/issues/697)
-and now the CLI compatible tools from FFmpeg are used instead. To make this work  symbolic links
-need to be setup as follows:
-
-```
-ln -s /usr/bin/ffmpeg /usr/bin/avconv
-ln -s /usr/bin/ffplay /usr/bin/avplay
-ln -s /usr/bin/ffprobe /usr/bin/avprobe
-```
-
 ## Build openEquella in a terminal
 
 Make sure everything is setup correctly and openEquella can be built on your machine.