From e0982a1941546e2fdd19ce07797524bf71f633de Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Sun, 13 Nov 2022 21:14:37 +0100 Subject: [PATCH 1/4] Fix FFmpeg version check for RTSP sources (datarhei/restreamer#455) --- src/views/Edit/Sources/Network.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Edit/Sources/Network.js b/src/views/Edit/Sources/Network.js index c4fcb84..ace076c 100644 --- a/src/views/Edit/Sources/Network.js +++ b/src/views/Edit/Sources/Network.js @@ -131,13 +131,14 @@ const initSkills = (initialSkills) => { const skills = { ffmpeg: {}, + formats: {}, protocols: {}, ...initialSkills, }; skills.ffmpeg = { version: '0.0.0', - ...skills.version, + ...skills.ffmpeg, }; skills.formats = { From 1d25b84ac5533cdc745dca49da72897b3797b554 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Mon, 14 Nov 2022 21:03:36 +0100 Subject: [PATCH 2/4] Update changelog and bump version to 1.5.1 --- CHANGELOG.md | 4 ++++ package.json | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a310460..5a7ee77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Restreamer-UI +## v1.5.0 > v1.5.1 + +- Fix FFmpeg version check for RTSP sources (datarhei/restreamer#455) + ## v1.4.0 > v1.5.0 - Add changelog viewer diff --git a/package.json b/package.json index 95549fc..0aa5df3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "restreamer-ui", - "version": "1.5.0", - "bundle": "restreamer-v2.4.0", + "version": "1.5.1", + "bundle": "restreamer-v2.4.1", "private": false, "license": "Apache-2.0", "dependencies": { @@ -89,4 +89,4 @@ "react-error-overlay": "^6.0.11" }, "resolutions": {} -} +} \ No newline at end of file From 1b9cfa279f8b7cbf2d220837e4f8ce092b8c1fd8 Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Mon, 14 Nov 2022 21:21:37 +0100 Subject: [PATCH 3/4] Fix requires Core >= v16.11.0 and FFmpeg >= 5.1.0 --- .github/workflows/build_restreamer-ui.new.yml | 47 +++++++++++++++++++ CHANGELOG.md | 1 + src/version.js | 4 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build_restreamer-ui.new.yml diff --git a/.github/workflows/build_restreamer-ui.new.yml b/.github/workflows/build_restreamer-ui.new.yml new file mode 100644 index 0000000..c5aa8e3 --- /dev/null +++ b/.github/workflows/build_restreamer-ui.new.yml @@ -0,0 +1,47 @@ +name: Share data between jobs + +on: [push] + +jobs: + job_1: + name: Build react + runs-on: ubuntu-latest + steps: + - name: Clone repository + uses: actions/checkout@v2 + - name: Use Node.js 19.0 + uses: actions/setup-node@v1 + with: + node-version: 19.0 + - name: Switch yarn version + run: yarn set version berry + - name: Set httpTimeout + run: yarn config set httpTimeout 600000 + - name: Install dependencies + run: yarn install + - name: Generate build + run: yarn run build + - name: Upload math result for job 1 + uses: actions/upload-artifact@v3 + with: + name: react-github-actions-build + path: build + + job_2: + name: Multiply by 9 + needs: job_1 + runs-on: windows-latest + steps: + - name: Download math result for job 1 + uses: actions/download-artifact@v3 + with: + name: react-github-actions-build + - shell: bash + run: | + value=`cat math-homework.txt` + expr $value \* 9 > math-homework.txt + - name: Upload math result for job 2 + uses: actions/upload-artifact@v3 + with: + name: homework + path: math-homework.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a7ee77..8f27d90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## v1.5.0 > v1.5.1 - Fix FFmpeg version check for RTSP sources (datarhei/restreamer#455) +- Fix requires Core >= v16.11.0 and FFmpeg >= 5.1.0 ## v1.4.0 > v1.5.0 diff --git a/src/version.js b/src/version.js index 01c7065..8dff732 100644 --- a/src/version.js +++ b/src/version.js @@ -1,7 +1,7 @@ import pkg from '../package.json'; -const Core = '^16.10.1'; -const FFmpeg = '^4.1.0 || ^5.0.0'; +const Core = '^16.11.0'; +const FFmpeg = '^5.1.0'; const UI = pkg.bundle ? pkg.bundle : pkg.name + ' v' + pkg.version; const Version = pkg.version; From 7fcc5bb65d459a5fc248117f600a47440b96cb90 Mon Sep 17 00:00:00 2001 From: Jan Stabenow Date: Mon, 14 Nov 2022 21:34:16 +0100 Subject: [PATCH 4/4] Del test build --- .github/workflows/build_restreamer-ui.new.yml | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 .github/workflows/build_restreamer-ui.new.yml diff --git a/.github/workflows/build_restreamer-ui.new.yml b/.github/workflows/build_restreamer-ui.new.yml deleted file mode 100644 index c5aa8e3..0000000 --- a/.github/workflows/build_restreamer-ui.new.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Share data between jobs - -on: [push] - -jobs: - job_1: - name: Build react - runs-on: ubuntu-latest - steps: - - name: Clone repository - uses: actions/checkout@v2 - - name: Use Node.js 19.0 - uses: actions/setup-node@v1 - with: - node-version: 19.0 - - name: Switch yarn version - run: yarn set version berry - - name: Set httpTimeout - run: yarn config set httpTimeout 600000 - - name: Install dependencies - run: yarn install - - name: Generate build - run: yarn run build - - name: Upload math result for job 1 - uses: actions/upload-artifact@v3 - with: - name: react-github-actions-build - path: build - - job_2: - name: Multiply by 9 - needs: job_1 - runs-on: windows-latest - steps: - - name: Download math result for job 1 - uses: actions/download-artifact@v3 - with: - name: react-github-actions-build - - shell: bash - run: | - value=`cat math-homework.txt` - expr $value \* 9 > math-homework.txt - - name: Upload math result for job 2 - uses: actions/upload-artifact@v3 - with: - name: homework - path: math-homework.txt