Skip to content

Commit 4063d67

Browse files
committed
Merge remote-tracking branch 'upstream/master' into vue3
2 parents eb3cd55 + 8cf019c commit 4063d67

File tree

5 files changed

+279
-282
lines changed

5 files changed

+279
-282
lines changed

.github/workflows/auto_publish_release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,16 @@ jobs:
6969
body: |
7070
See [${{ env.CHANGELOG_FILE }}](https://github.com/${{ github.repository }}/blob/master/${{ env.CHANGELOG_FILE }}) for details.
7171
72-
sha256sum: ${{ env.SHA256SUM }}
72+
sha256sum:
73+
```
74+
${{ env.SHA256SUM }}
75+
```
7376
# TODO: Get topmost changelog section somehow and use that as the body?
7477

7578
- name: Upload Release Asset
76-
id: upload-release-asset
77-
uses: actions/upload-release-asset@v1
7879
env:
7980
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
80-
with:
81-
upload_url: ${{ steps.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
82-
asset_path: ./${{ env.ZIP_ARCHIVE }}
83-
asset_name: ${{ env.ZIP_ARCHIVE }}
84-
asset_content_type: application/zip
81+
run: gh release upload "$VERSION" "$ZIP_ARCHIVE"
8582

8683
- name: Comment on the release PR with the results & next steps
8784
if: always()

.yarn/releases/yarn-3.5.0.cjs renamed to .yarn/releases/yarn-3.5.1.cjs

Lines changed: 266 additions & 266 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ networkSettings:
1010

1111
nodeLinker: node-modules
1212

13-
yarnPath: .yarn/releases/yarn-3.5.0.cjs
13+
yarnPath: .yarn/releases/yarn-3.5.1.cjs

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"json-server": "^0.17.0",
7474
"nodemon": "^2.0.19",
7575
"nyc": "^15.1.0",
76-
"sass": "~1.60.0",
76+
"sass": "~1.62.0",
7777
"sinon": "^15.0.0",
7878
"standard": "^17.0.0",
7979
"subscriptions-transport-ws": "^0.11.0",
@@ -87,5 +87,5 @@
8787
"bugs": {
8888
"url": "https://github.com/cylc/cylc-ui/issues"
8989
},
90-
"packageManager": "[email protected].0"
90+
"packageManager": "[email protected].1"
9191
}

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2811,7 +2811,7 @@ __metadata:
28112811
nyc: ^15.1.0
28122812
preact: ^10.6.6
28132813
preact-compat: ^3.19.0
2814-
sass: ~1.60.0
2814+
sass: ~1.62.0
28152815
sinon: ^15.0.0
28162816
standard: ^17.0.0
28172817
subscriptions-transport-ws: ^0.11.0
@@ -7613,16 +7613,16 @@ __metadata:
76137613
languageName: node
76147614
linkType: hard
76157615

7616-
"sass@npm:~1.60.0":
7617-
version: 1.60.0
7618-
resolution: "sass@npm:1.60.0"
7616+
"sass@npm:~1.62.0":
7617+
version: 1.62.1
7618+
resolution: "sass@npm:1.62.1"
76197619
dependencies:
76207620
chokidar: ">=3.0.0 <4.0.0"
76217621
immutable: ^4.0.0
76227622
source-map-js: ">=0.6.2 <2.0.0"
76237623
bin:
76247624
sass: sass.js
7625-
checksum: 06e163c37af466ec194cf2ed8dab616372afeb19322d356947d48ea664fc38398ae77c4d91bea9cb0ace954ce289d5518d0f8555ecc49f6bf2539a8ef52fc580
7625+
checksum: 1b1b3584b38a63dd94156b65f13b90e3f84b170a38c3d5e3fa578b7a32a37aeb349b4926b0eaf9448d48e955e86b1ee01b13993f19611dad8068af07a607c13b
76267626
languageName: node
76277627
linkType: hard
76287628

0 commit comments

Comments
 (0)