From 1d834f992001a23a898c344231f0bd3485bde253 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:26:03 +1000 Subject: [PATCH 01/13] Adding workflow file for pushing library to npm --- .github/workflows/container-images.yml | 31 +++++++++++++++++++ .../workflows/publish-library-to-npm.yml | 4 +-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/container-images.yml rename Frontend/.github/workflows/release.yml => .github/workflows/publish-library-to-npm.yml (86%) diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml new file mode 100644 index 00000000..1cecde9c --- /dev/null +++ b/.github/workflows/container-images.yml @@ -0,0 +1,31 @@ +name: Publish the Signalling Server container image from our dev branch + +on: + push: + branches: ['githubactions'] + paths: ['SignallingWebServer/**'] + +jobs: + signalling-server-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - + name: Checkout + uses: actions/checkout@v3 + - + name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - + name: Build and push the Signalling Server container image for Unreal Engine based on our development branch + uses: docker/build-push-action@v3 + with: + context: ./SignallingWebServer + tags: 'ghcr.io/epicgames/pixel-streaming-signalling-server:dev' + push: true \ No newline at end of file diff --git a/Frontend/.github/workflows/release.yml b/.github/workflows/publish-library-to-npm.yml similarity index 86% rename from Frontend/.github/workflows/release.yml rename to .github/workflows/publish-library-to-npm.yml index 562813ed..42293618 100644 --- a/Frontend/.github/workflows/release.yml +++ b/.github/workflows/publish-library-to-npm.yml @@ -1,8 +1,8 @@ name: Publish library package to npmjs on: push: - tags: - - '*' + branches: ['githubactions'] + paths: ['Frontend/library/package.json'] jobs: build: runs-on: ubuntu-latest From 5edad8c41414d18fb779075e28fcbe2141b2f25f Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:35:07 +1000 Subject: [PATCH 02/13] Update package.json minor version Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com> --- Frontend/library/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/library/package.json b/Frontend/library/package.json index 707374dc..03b3e2d4 100644 --- a/Frontend/library/package.json +++ b/Frontend/library/package.json @@ -1,6 +1,6 @@ { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.0.1", + "version": "0.1.1", "description": "Frontend library for Pixel Streaming", "main": "dist/lib-pixelstreamingfrontend.min.js", "types": "types/pixelstreamingfrontend.d.ts", From b163ac94aa3b0ebce7e78b713d7061e12c4b591f Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:37:47 +1000 Subject: [PATCH 03/13] Fix typo in github actions library workflow --- .github/workflows/publish-library-to-npm.yml | 2 +- Frontend/library/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-library-to-npm.yml b/.github/workflows/publish-library-to-npm.yml index 42293618..1dfc6b7d 100644 --- a/.github/workflows/publish-library-to-npm.yml +++ b/.github/workflows/publish-library-to-npm.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./library + working-directory: Frontend/library steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/Frontend/library/package.json b/Frontend/library/package.json index 03b3e2d4..126ba3a2 100644 --- a/Frontend/library/package.json +++ b/Frontend/library/package.json @@ -1,6 +1,6 @@ { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.1.1", + "version": "0.1.2", "description": "Frontend library for Pixel Streaming", "main": "dist/lib-pixelstreamingfrontend.min.js", "types": "types/pixelstreamingfrontend.d.ts", From 500114b3d5f9860b2872896c81bdb05c8d7ef6c8 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 15:47:22 +1000 Subject: [PATCH 04/13] Update token on the backend, force version bump --- Frontend/library/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/library/package.json b/Frontend/library/package.json index 126ba3a2..ca83279d 100644 --- a/Frontend/library/package.json +++ b/Frontend/library/package.json @@ -1,6 +1,6 @@ { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.1.2", + "version": "0.1.0", "description": "Frontend library for Pixel Streaming", "main": "dist/lib-pixelstreamingfrontend.min.js", "types": "types/pixelstreamingfrontend.d.ts", From 5f53599fc8f29db33e22c546c845d2d4e6920898 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 17:32:43 +1000 Subject: [PATCH 05/13] Added workflow for making a release when RELEASE_VERSION file is changed --- .github/workflows/create-gh-release.yml | 62 +++++++++++++++++++++++++ RELEASE_VERSION | 2 +- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/create-gh-release.yml diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml new file mode 100644 index 00000000..a14fb36e --- /dev/null +++ b/.github/workflows/create-gh-release.yml @@ -0,0 +1,62 @@ +name: Releases + +on: + push: + branches: ['githubactions'] + paths: ['RELEASE_VERSION'] + +jobs: + + build: + runs-on: ubuntu-latest + defaults: + run: + working-directory: Frontend + + permissions: + contents: write + steps: + - name: "Checkout source code" + uses: actions/checkout@v2 + + - name: Read VERSION file + id: getversion + run: echo "::set-output name=version::$(cat VERSION)" + + - uses: actions/setup-node@v3 + with: + node-version: '16.x' + registry-url: 'https://registry.npmjs.org' + - run: cd library + - run: npm ci + - run: npm run build + - run: cd ../implementations/EpicGames + - run: npm ci + - run: npm run build-all + - run: cd ../../.. + - run: mkdir output + + - name: Archive Release tar.gz + uses: thedoctor0/zip-release@0.7.1 + with: + directory: './output' + path: '../' + type: 'tar' + filename: '{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz' + exclusions: '*.git* /*node_modules/* .editorconfig /*types/* /*dist*/ /*output*/' + + - name: Archive Release tar.gz + uses: thedoctor0/zip-release@0.7.1 + with: + directory: './output' + path: '../' + type: 'zip' + filename: '{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip' + exclusions: '*.git* /*node_modules/* .editorconfig /*types/* /*dist*/ /*output*/' + + - name: "Make the release" + uses: ncipollo/release-action@v1 + with: + tag: "{{ github.ref_name }}-${{ steps.getversion.outputs.version }}" + artifacts: "{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" + generateReleaseNotes: true \ No newline at end of file diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 8a9ecc2e..7bcd0e36 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -0.0.1 \ No newline at end of file +0.0.2 \ No newline at end of file From 70a6576aab88d59cc1fe6485b3a6e93cd806eda4 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Thu, 16 Feb 2023 17:41:11 +1000 Subject: [PATCH 06/13] Fix how directories were being set in github action for release --- .github/workflows/create-gh-release.yml | 29 +++++++++++++++++-------- RELEASE_VERSION | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml index a14fb36e..d21f1591 100644 --- a/.github/workflows/create-gh-release.yml +++ b/.github/workflows/create-gh-release.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: Frontend + working-directory: ./ permissions: contents: write @@ -27,14 +27,25 @@ jobs: with: node-version: '16.x' registry-url: 'https://registry.npmjs.org' - - run: cd library - - run: npm ci - - run: npm run build - - run: cd ../implementations/EpicGames - - run: npm ci - - run: npm run build-all - - run: cd ../../.. - - run: mkdir output + + - name: Install library deps + working-directory: ./Frontend/library + run: npm ci + + - name: Build frontend lib + working-directory: ./Frontend/library + run: npm run build + + - name: Install implementations/EpicGames deps + working-directory: ./Frontend/implementations/EpicGames + run: npm ci + + - name: Build implementations/EpicGames + working-directory: ./Frontend/implementations/EpicGames + run: npm run build-all + + - name: Make output directory for archives + run: mkdir output - name: Archive Release tar.gz uses: thedoctor0/zip-release@0.7.1 diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 7bcd0e36..6812f812 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file From bd62c3fc88008edda70c3d37ba59ff65594362b6 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 11:42:22 +1000 Subject: [PATCH 07/13] Changed dir exclusions when making a release binary --- .github/workflows/create-gh-release.yml | 12 ++++++------ RELEASE_VERSION | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml index d21f1591..72ab9960 100644 --- a/.github/workflows/create-gh-release.yml +++ b/.github/workflows/create-gh-release.yml @@ -53,8 +53,8 @@ jobs: directory: './output' path: '../' type: 'tar' - filename: '{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz' - exclusions: '*.git* /*node_modules/* .editorconfig /*types/* /*dist*/ /*output*/' + filename: '${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz' + exclusions: '.git .github output Frontend/Docs Frontend/library/dist Frontend/library/types Frontend/library/node_modules Frontend/implementations/EpicGames/node_modules' - name: Archive Release tar.gz uses: thedoctor0/zip-release@0.7.1 @@ -62,12 +62,12 @@ jobs: directory: './output' path: '../' type: 'zip' - filename: '{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip' - exclusions: '*.git* /*node_modules/* .editorconfig /*types/* /*dist*/ /*output*/' + filename: '${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip' + exclusions: '*.git* /*node_modules/* .editorconfig /*types/* /*dist/* /*output/* /*Docs/*' - name: "Make the release" uses: ncipollo/release-action@v1 with: - tag: "{{ github.ref_name }}-${{ steps.getversion.outputs.version }}" - artifacts: "{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,{{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" + tag: "${{ github.ref_name }}-${{ steps.getversion.outputs.version }}" + artifacts: "${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" generateReleaseNotes: true \ No newline at end of file diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 6812f812..7bcd0e36 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -0.0.3 \ No newline at end of file +0.0.2 \ No newline at end of file From 6a8c018605a49169c52cbad496f30f122365da05 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 11:48:48 +1000 Subject: [PATCH 08/13] Fix reading RELEASE_VERSION file during github action for making a release --- .github/workflows/create-gh-release.yml | 4 ++-- RELEASE_VERSION | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml index 72ab9960..9046202f 100644 --- a/.github/workflows/create-gh-release.yml +++ b/.github/workflows/create-gh-release.yml @@ -19,9 +19,9 @@ jobs: - name: "Checkout source code" uses: actions/checkout@v2 - - name: Read VERSION file + - name: Read the RELEASE_VERSION file id: getversion - run: echo "::set-output name=version::$(cat VERSION)" + run: echo "::set-output name=version::$(cat RELEASE_VERSION)" - uses: actions/setup-node@v3 with: diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 7bcd0e36..6812f812 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -0.0.2 \ No newline at end of file +0.0.3 \ No newline at end of file From 29b83ef6354c901b706bc4c0b039af25cbe8d743 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:02:31 +1000 Subject: [PATCH 09/13] Fix warnings and non-located archives in release action --- .github/workflows/create-gh-release.yml | 6 +++--- RELEASE_VERSION | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml index 9046202f..be34a500 100644 --- a/.github/workflows/create-gh-release.yml +++ b/.github/workflows/create-gh-release.yml @@ -17,11 +17,11 @@ jobs: contents: write steps: - name: "Checkout source code" - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Read the RELEASE_VERSION file id: getversion - run: echo "::set-output name=version::$(cat RELEASE_VERSION)" + run: echo "version=$(cat RELEASE_VERSION)" >> $GITHUB_OUTPUT - uses: actions/setup-node@v3 with: @@ -69,5 +69,5 @@ jobs: uses: ncipollo/release-action@v1 with: tag: "${{ github.ref_name }}-${{ steps.getversion.outputs.version }}" - artifacts: "${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" + artifacts: "output/${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,output/${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" generateReleaseNotes: true \ No newline at end of file diff --git a/RELEASE_VERSION b/RELEASE_VERSION index 6812f812..7bcd0e36 100644 --- a/RELEASE_VERSION +++ b/RELEASE_VERSION @@ -1 +1 @@ -0.0.3 \ No newline at end of file +0.0.2 \ No newline at end of file From 7d6dd0031b0d106d2ca3e52c745f8aa3a7bb8e42 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 17:42:04 +1000 Subject: [PATCH 10/13] Update container-images.yml Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com> --- .github/workflows/container-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/container-images.yml b/.github/workflows/container-images.yml index 1cecde9c..ac0da326 100644 --- a/.github/workflows/container-images.yml +++ b/.github/workflows/container-images.yml @@ -2,7 +2,7 @@ name: Publish the Signalling Server container image from our dev branch on: push: - branches: ['githubactions'] + branches: ['master'] paths: ['SignallingWebServer/**'] jobs: @@ -28,4 +28,4 @@ jobs: with: context: ./SignallingWebServer tags: 'ghcr.io/epicgames/pixel-streaming-signalling-server:dev' - push: true \ No newline at end of file + push: true From c071cb6ddefe26c9b141ff078759817db74da447 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 17:42:47 +1000 Subject: [PATCH 11/13] Update create-gh-release.yml Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com> --- .github/workflows/create-gh-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-gh-release.yml b/.github/workflows/create-gh-release.yml index be34a500..16a03351 100644 --- a/.github/workflows/create-gh-release.yml +++ b/.github/workflows/create-gh-release.yml @@ -2,7 +2,7 @@ name: Releases on: push: - branches: ['githubactions'] + branches: ['master'] paths: ['RELEASE_VERSION'] jobs: @@ -70,4 +70,4 @@ jobs: with: tag: "${{ github.ref_name }}-${{ steps.getversion.outputs.version }}" artifacts: "output/${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.zip,output/${{ github.ref_name }}-${{ steps.getversion.outputs.version }}.tar.gz" - generateReleaseNotes: true \ No newline at end of file + generateReleaseNotes: true From 3ea86cf2939497ebe76ef2276861b2bb7b5099ff Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 17:43:03 +1000 Subject: [PATCH 12/13] Update publish-library-to-npm.yml Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com> --- .github/workflows/publish-library-to-npm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-library-to-npm.yml b/.github/workflows/publish-library-to-npm.yml index 1dfc6b7d..ee27b182 100644 --- a/.github/workflows/publish-library-to-npm.yml +++ b/.github/workflows/publish-library-to-npm.yml @@ -1,7 +1,7 @@ name: Publish library package to npmjs on: push: - branches: ['githubactions'] + branches: ['master'] paths: ['Frontend/library/package.json'] jobs: build: From 0a76056416c326d8eaf6f8d086abcbc5c75b0801 Mon Sep 17 00:00:00 2001 From: Luke Bermingham <1215582+lukehb@users.noreply.github.com> Date: Fri, 17 Feb 2023 17:46:14 +1000 Subject: [PATCH 13/13] Update package.json Signed-off-by: Luke Bermingham <1215582+lukehb@users.noreply.github.com> --- Frontend/library/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Frontend/library/package.json b/Frontend/library/package.json index ca83279d..03b3e2d4 100644 --- a/Frontend/library/package.json +++ b/Frontend/library/package.json @@ -1,6 +1,6 @@ { "name": "@epicgames-ps/lib-pixelstreamingfrontend-dev", - "version": "0.1.0", + "version": "0.1.1", "description": "Frontend library for Pixel Streaming", "main": "dist/lib-pixelstreamingfrontend.min.js", "types": "types/pixelstreamingfrontend.d.ts",