Skip to content

Commit 681b87c

Browse files
Merge pull request #558 from mcottontensor/backport/UE5.5/pr-543
[UE5.5] Merge pull request #543 from Belchy06/version
2 parents e4597be + cdf4eec commit 681b87c

File tree

16 files changed

+81
-57
lines changed

16 files changed

+81
-57
lines changed

.github/workflows/create-gh-release.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ jobs:
4545
id: getversion
4646
run: echo "version=$(cat RELEASE_VERSION)" >> $GITHUB_OUTPUT
4747

48+
- name: Get node version
49+
id: get_node_version
50+
run: echo "node_version=$(cat NODE_VERSION)" >> $Env:GITHUB_OUTPUT
51+
4852
- uses: actions/setup-node@v3
4953
with:
50-
node-version: '18.17.0'
54+
node-version: ${{ steps.get_node_version.outputs.node_version }}
5155
registry-url: 'https://registry.npmjs.org'
5256

5357
- name: Build common library

.github/workflows/healthcheck-frontend.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,13 @@ jobs:
5151
# - name: Checkout source code
5252
# uses: actions/checkout@v3
5353
#
54+
# - name: Get node version
55+
# id: get_node_version
56+
# run: echo "node_version=$(cat NODE_VERSION)" >> $Env:GITHUB_OUTPUT
57+
#
5458
# - uses: actions/setup-node@v4
5559
# with:
56-
# node-version: 'v18.17.0'
60+
# node-version: ${{ steps.get_node_version.outputs.node_version }}
5761
#
5862
# - name: Download streamer
5963
# uses: robinraju/release-downloader@v1

.github/workflows/healthcheck-streaming.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,13 @@ jobs:
5252
- name: Checkout source code
5353
uses: actions/checkout@v3
5454

55+
- name: Get node version
56+
id: get_node_version
57+
run: echo "node_version=$(cat NODE_VERSION)" >> $Env:GITHUB_OUTPUT
58+
5559
- uses: actions/setup-node@v4
5660
with:
57-
node-version: 'v18.17.0'
61+
node-version: ${{ steps.get_node_version.outputs.node_version }}
5862

5963
- name: Download streamer
6064
uses: robinraju/release-downloader@v1
@@ -103,21 +107,22 @@ jobs:
103107
npm install
104108
npm run build
105109
106-
- name: Run Signalling
107-
working-directory: SignallingWebServer
108-
run: Start-Process "npm" -ArgumentList "run","start","--","--rest_api","--player_port 999","--http_root ${{ github.workspace }}\www"
109-
110-
- name: Run Streamer
111-
working-directory: Streamer
112-
run: Start-Process ".\Minimal\Binaries\Win64\Minimal-Cmd.exe" -ArgumentList "-warp","-dx12","-windowed","-resx=1920","-resy=720","-PixelStreamingURL=ws://localhost:8888","-RenderOffScreen","-AllowSoftwareRendering","-PixelStreamingEncoderCodec=vp8", "-Log=Minimal.log"
113-
114110
- name: Prepare test
115111
working-directory: Extras\MinimalStreamTester
116112
run: |
117113
npm install
118114
npx playwright install --with-deps
119115
npx playwright install chrome
120116
117+
- name: Run Signalling
118+
working-directory: SignallingWebServer
119+
# triple hyphen for npm script running issues. With double the arguments get mangled
120+
run: Start-Process powershell.exe -ArgumentList "npm","run","start","---","--rest_api","--player_port 999","--http_root ${{ github.workspace }}\www"
121+
122+
- name: Run Streamer
123+
working-directory: Streamer
124+
run: Start-Process ".\Minimal\Binaries\Win64\Minimal-Cmd.exe" -ArgumentList "-warp","-dx12","-windowed","-resx=1920","-resy=720","-PixelStreamingURL=ws://localhost:8888","-RenderOffScreen","-AllowSoftwareRendering","-PixelStreamingEncoderCodec=vp8", "-Log=Minimal.log"
125+
121126
- name: Wait for signalling to come up
122127
run: curl --retry 10 --retry-delay 20 --retry-connrefused http://localhost:999/api/status
123128

Extras/JSStreamer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ COPY /Extras/eslint/plugin-check-copyright ./Extras/eslint/plugin-check-copyrigh
88
COPY /Common ./Common
99
COPY /Extras/JSStreamer ./Extras/JSStreamer
1010
COPY ./package.json ./package.json
11+
COPY NODE_VERSION ./NODE_VERSION
1112

1213
# Initiate NPM workspaces so we can install deps like our common lib using local built packages as opposed to remove published packages
1314
RUN npm install

Extras/MinimalStreamTester/dockerfiles/windows/Dockerfile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1+
# escape=`
2+
13
FROM mcr.microsoft.com/windows:ltsc2019
24

35
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop';$ProgressPreference='silentlyContinue';"]
46

5-
RUN Invoke-WebRequest -OutFile nodejs.zip -UseBasicParsing "https://nodejs.org/dist/v18.17.0/node-v18.17.0-win-x64.zip"; Expand-Archive nodejs.zip -DestinationPath C:\; Rename-Item "C:\\node-v18.17.0-win-x64" c:\nodejs
7+
WORKDIR C:/tester
8+
COPY NODE_VERSION .
9+
10+
RUN $node_version = Get-Content NODE_VERSION -Raw; `
11+
Invoke-WebRequest -OutFile nodejs.zip -UseBasicParsing "https://nodejs.org/dist/$node_version/node-$node_version-win-x64.zip"; `
12+
Expand-Archive nodejs.zip -DestinationPath C:\; `
13+
Rename-Item "C:\node-$node_version-win-x64" c:\nodejs
14+
15+
RUN Set-ExecutionPolicy -ExecutionPolicy Unrestricted
616

717
RUN setx /M PATH \"$Env:PATH;C:\nodejs\"
818

919
RUN npm config set registry https://registry.npmjs.org/
1020

1121
# Copy the signalling server and frontend source code from the build context
12-
WORKDIR C:/tester
1322
COPY /Extras/MinimalStreamTester .
1423

1524
# Install the dependencies for the signalling server and build the frontend

Extras/SS_Test/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM node:18.17.0 as builder
1+
FROM node:22.14.0 as builder
22

33
WORKDIR /SignallingTester
44

5+
COPY NODE_VERSION ./NODE_VERSION
56
COPY package.json ./package.json
67
COPY Common/ ./Common
78
COPY Extras/SS_Test/ ./Extras/SS_Test

Frontend/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ If part of the library is not exposed and you wish to extend it, please do so in
3939

4040
## Developing
4141

42-
⚠️ Only NodeJS LTS 18.17.0 is officially supported, some newer versions on NodeJS **WILL BREAK YOUR BUILD** ⚠️
42+
⚠️ Only NodeJS LTS 22.14.0 is officially supported, some newer versions on NodeJS **WILL BREAK YOUR BUILD** ⚠️
4343

4444
### Prerequisites for local dev
45-
- Install NodeJS LTS 18.17.0 on your system.
45+
- Install NodeJS LTS 22.14.0 on your system.
4646
- Install npm globally using: `npm install npm -g` (yes this is required)
4747

4848
### Building the Library

NODE_VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22.14.0

SFU/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Use the current Long Term Support (LTS) version of Node.js
22
FROM node:lts
33

4+
COPY NODE_VERSION ./NODE_VERSION
45
COPY /SFU /SFU
56

67
RUN SFU/platform_scripts/bash/setup.sh

SFU/platform_scripts/bash/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ RUN apt -y update
77
RUN apt -y install python3-pip
88

99
# Copy the Selective Forwarding Unit (SFU) to the Docker build context
10+
COPY ../NODE_VERSION /opt/NODE_VERSION
1011
COPY . /opt/SFU
1112

1213
# Install the dependencies for the mediasoup server

0 commit comments

Comments
 (0)