Skip to content

Commit 63a22b2

Browse files
authored
Merge pull request #5485 from 3drepo/qa
Release Candidate 5.16.0
2 parents 65fa8db + 389331c commit 63a22b2

File tree

565 files changed

+14275
-21609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

565 files changed

+14275
-21609
lines changed

.azure/build-and-deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resources:
1717

1818
variables:
1919
# Agent VM image name
20-
vmImageName: 'ubuntu-20.04'
20+
vmImageName: 'ubuntu-24.04'
2121
# Container registry service connection established during pipeline creation
2222
dockerRegistryServiceConnection: '3drepo.azurecr.io'
2323
imageRepository: '3drepo.io'
@@ -120,7 +120,7 @@ stages:
120120
command: 'upgrade'
121121
chartType: 'Name'
122122
chartName: '3drepo/io'
123-
chartVersion: '5.12.2'
123+
chartVersion: '5.15.0'
124124
waitForExecution: false
125125
releaseName: '$(branchName)'
126126
overrideValues: 'image.tag=$(Build.SourceVersion),branchName=$(branchName),$(customHelmOverride)'

.azure/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resources:
1414

1515
variables:
1616
# Agent VM image name
17-
vmImageName: 'ubuntu-20.04'
17+
vmImageName: 'ubuntu-24.04'
1818
# Container registry service connection established during pipeline creation
1919
dockerRegistryServiceConnection: '3drepo.azurecr.io'
2020
imageRepository: '3drepo.io'

.azure/destroy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger: none
22

33
variables:
44
# Agent VM image name
5-
vmImageName: 'ubuntu-20.04'
5+
vmImageName: 'ubuntu-24.04'
66
# Container registry service connection established during pipeline creation
77
dockerRegistryServiceConnection: '3drepo.azurecr.io'
88
imageRepository: '3drepo.io'
@@ -44,4 +44,4 @@ stages:
4444
kubernetesServiceConnection: 'stg3drepo'
4545
namespace: 'default'
4646
command: 'uninstall'
47-
arguments: '$(branchName)'
47+
arguments: '$(branchName)'

.github/workflows/automaticTesting.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
run-backend-tests:
1616
name: Run Backend tests
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
services:
1919
rabbitmq:
2020
image: rabbitmq:3.10.5-management
@@ -51,7 +51,7 @@ jobs:
5151

5252
run-backend-lint:
5353
name: Run Backend lint
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-24.04
5555
steps:
5656
- name: Check out Git repository
5757
uses: actions/checkout@v3
@@ -77,7 +77,7 @@ jobs:
7777

7878
run-frontend-tests:
7979
name: Run Frontend tests
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-24.04
8181

8282
steps:
8383
- name: Check out Git repository
@@ -108,7 +108,7 @@ jobs:
108108

109109
run-frontend-lint:
110110
name: Run Frontend lint
111-
runs-on: ubuntu-20.04
111+
runs-on: ubuntu-24.04
112112

113113
steps:
114114
- name: Check out Git repository
@@ -139,7 +139,7 @@ jobs:
139139
# make sure we're not merging DevOps changes
140140
devops-sanity-check:
141141
name: Ensure that custom settings are not being merged
142-
runs-on: ubuntu-20.04
142+
runs-on: ubuntu-24.04
143143
steps:
144144
- name: Checkout .azure/build-and-deploy.yaml
145145
uses: Bhacaz/checkout-files@v2

.github/workflows/onPRClose.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@ jobs:
5050
destroy-deployed-branch:
5151
name: Call Azure Destroy Pipeline
5252
runs-on: ubuntu-latest
53-
needs: get-details
5453
steps:
54+
- name: Set branch name to destroy
55+
run: |
56+
echo 'chartName='$( echo ${{ github.head_ref || github.ref_name }} | sed "s/_/-/" | awk '{print tolower($0)}' ) >> "$GITHUB_OUTPUT"
57+
id: getChartName
5558
- name: Azure Pipelines Action
56-
if: needs.get-details.outputs.issue-number
59+
if: ${{ (steps.getChartName.outputs.chartName != 'staging') && (steps.getChartName.outputs.chartName != 'master') }}
5760
uses: Azure/[email protected]
5861
with:
5962
azure-devops-project-url: https://dev.azure.com/3drepo/3drepo.io
6063
azure-pipeline-name: 'destroy'
6164
azure-devops-token: ${{ secrets.AZURE_DEVOPS_TOKEN }}
62-
azure-pipeline-variables: '{"branchName": "issue-${{ needs.get-details.outputs.issue-number }}"}'
65+
azure-pipeline-variables: '{"branchName": "${{ steps.getChartName.outputs.chartName }}"}'

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ matrix:
22
include:
33
# tests (v4)
44
- language: node_js
5-
dist: jammy
5+
dist: noble
66
name: Backend tests (V4)
77
git:
88
submodules: false
99
depth: 1
1010
node_js:
11-
- "18.20.4"
11+
- "18.20.6"
1212
sudo: true
1313
addons:
1414
apt:
@@ -23,9 +23,9 @@ matrix:
2323

2424
before_install:
2525
- sudo apt remove mongodb && sudo apt purge mongodb && sudo apt autoremove && sudo rm -rf /var/lib/mongodb
26-
- sudo apt-get -y install gnupg curl
27-
- curl -fsSL https://www.mongodb.org/static/pgp/server-6.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-6.0.gpg --dearmor
28-
- echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-6.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
26+
- sudo apt-get -y install gnupg curl expect
27+
- curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
28+
- echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
2929
- sudo apt-get update
3030
- sudo apt-get install -y mongodb-org mongodb-org-database mongodb-org-server mongodb-org-mongos mongodb-org-tools
3131
- sudo mkdir -p /var/lib/mongodb

backend/VERSION.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
{ "VERSION" : "5.14.2",
1+
{ "VERSION" : "5.15.0",
22
"unity" : {
33
"current" : "5.20.0",
44
"supported": []
55
},
66
"civil" :{
7-
"current" : "5.14.0",
8-
"supported": ["5.10.1"]
7+
"current" : "5.16.0",
8+
"supported": []
99
},
1010
"navis" :{
11-
"current" : "5.14.0",
12-
"supported": ["5.10.2"]
11+
"current" : "5.16.0",
12+
"supported": []
1313
},
1414
"revit" :{
15-
"current" : "5.14.0",
16-
"supported": ["5.10.1"]
15+
"current" : "5.16.0",
16+
"supported": []
1717
},
1818
"unitydll" : {
1919
"current": "5.4.0",
@@ -29,6 +29,6 @@
2929
},
3030
"powerbi" : {
3131
"current": "5.10.0",
32-
"supported": ["5.10.0"]
32+
"supported": []
3333
}
3434
}

backend/jest-mongodb-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module.exports = {
1919
mongodbMemoryServerOptions: {
2020
binary: {
21-
version: '5.0.8',
21+
version: '8.0.4',
2222
skipMD5: true,
2323
downloadDir: './node_modules/.cache',
2424
},

backend/jest.config.e2e.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ config.coveragePathIgnorePatterns = [
2525

2626
config.testMatch = ['**/tests/**/e2e/**/*.test.[jt]s?(x)'];
2727
config.testSequencer = './jest.sequencer.e2e.js'
28+
config.setupFiles = ["./tests/v5/e2e/setup.js"];
2829

2930
module.exports = config;

backend/jest.config.scripts.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const config = require('./jest.config');
1919

2020
config.collectCoverageFrom = ['src/scripts/utility/**/*.js'];
2121
config.coveragePathIgnorePatterns = ['index.js', 'scheduler*'];
22+
config.setupFiles = ['./tests/v5/scripts/setup.js'];
2223

2324
config.testMatch = ['**/tests/**/scripts/**/*.test.[jt]s?(x)'];
2425

0 commit comments

Comments
 (0)