Skip to content

Commit b43814f

Browse files
Merging UE5.5 back into master (#574)
* Action audit (#565) (#566) - Removing duplicated push and pull_request triggers - Removing multiple install commands when one root will work. - Removing references to UE5.5 in favor of wildcard matching (cherry picked from commit 4ee5695) Co-authored-by: mcottontensor <80377552+mcottontensor@users.noreply.github.com> * [UE5.5] Moved frontend library from a peer dep to a normal dep in ui-library (#568) (#569) * Moved frontend library from a peer dep to a normal dep in ui-library (#568) (cherry picked from commit e255bc0) # Conflicts: # Frontend/ui-library/package.json # package-lock.json * Fixing package-lock issues * Fixing issue where workspace path doesnt exist in npm publish action (#570) (#571) Trying to also fix issues with the changelog update perms. (cherry picked from commit 4f9b8a7) Co-authored-by: mcottontensor <80377552+mcottontensor@users.noreply.github.com> * Trying to fix changelog update action * Still trying to fix changeset update action * What a nightmare * Updated NPM changelogs (#572) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fixing publish action. * Fixing publish action more. * Wrong package file. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 4f9b8a7 commit b43814f

File tree

5 files changed

+29
-563
lines changed

5 files changed

+29
-563
lines changed

.github/workflows/changesets-publish-npm-packages.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ jobs:
5555
- name: Checkout Repo
5656
uses: actions/checkout@v3
5757

58+
- name: Remove workspace package
59+
run: rm package.json
60+
5861
- name: Get node version
5962
id: get_node_version
6063
run: echo "node_version=$(cat NODE_VERSION)" >> $GITHUB_OUTPUT
@@ -71,7 +74,7 @@ jobs:
7174
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
7275
run: |
7376
npm install
74-
npm build
77+
npm run build
7578
npm publish --access public
7679
7780
- name: Build the version label

.github/workflows/changesets-update-changelogs.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ on:
88

99
concurrency: ${{ github.workflow }}-${{ github.ref }}
1010

11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
1115
jobs:
1216
release:
1317
name: Release
1418
runs-on: ubuntu-latest
15-
permissions:
16-
contents: write
17-
pull-requests: write
1819
steps:
1920
- name: Checkout Repo
2021
uses: actions/checkout@v3
@@ -28,9 +29,9 @@ jobs:
2829
run: npm install
2930

3031
- name: Create Release Pull Request
31-
uses: changesets/action@v1
32+
uses: changesets/action@v1.4.10
3233
env:
33-
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
34+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3435
with:
3536
title: '[Bot] Update ${{ github.ref_name }} NPM Changelogs'
3637
commit: 'Updated NPM changelogs'

Frontend/ui-library/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# @epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.5
2+
3+
## 1.1.0
4+
5+
### Minor Changes
6+
7+
- 8961c17: Frontend library is no longer a peer dependency but instead now a normal dependency.

Frontend/ui-library/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@epicgames-ps/lib-pixelstreamingfrontend-ui-ue5.5",
3-
"version": "1.0.2",
3+
"version": "1.1.0",
44
"description": "Reference frontend UI library for Unreal Engine 5.5 Pixel Streaming - gives the stock look and feel.",
55
"main": "dist/cjs/pixelstreamingfrontend-ui.js",
66
"module": "dist/esm/pixelstreamingfrontend-ui.js",

0 commit comments

Comments
 (0)