Skip to content

Commit

Permalink
Upmerge to edge (#1894)
Browse files Browse the repository at this point in the history
* Update samples for v0.40

* Bump cookie and express in /samples/dapr/nodeapp (#1885)

Bumps [cookie](https://github.com/jshttp/cookie) to 0.7.1 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `cookie` from 0.6.0 to 0.7.1
- [Release notes](https://github.com/jshttp/cookie/releases)
- [Commits](jshttp/cookie@v0.6.0...v0.7.1)

Updates `express` from 4.21.0 to 4.21.1
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/4.21.1/History.md)
- [Commits](expressjs/express@4.21.0...4.21.1)

---
updated-dependencies:
- dependency-name: cookie
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump cross-spawn from 7.0.3 to 7.0.6 in /samples/demo/client (#1886)

Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6.
- [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md)
- [Commits](moxystudio/node-cross-spawn@v7.0.3...v7.0.6)

---
updated-dependencies:
- dependency-name: cross-spawn
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump http-proxy-middleware from 2.0.6 to 2.0.7 in /samples/demo/client (#1881)

Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.6 to 2.0.7.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.7/CHANGELOG.md)
- [Commits](chimurai/http-proxy-middleware@v2.0.6...v2.0.7)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yetkin Timocin <[email protected]>

* signoff for upmerge git commit (#1889)

Signed-off-by: Brooke Hamilton <[email protected]>

---------

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Brooke Hamilton <[email protected]>
Signed-off-by: Radius CI Bot <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yetkin Timocin <[email protected]>
Co-authored-by: Brooke Hamilton <[email protected]>
  • Loading branch information
4 people authored Dec 6, 2024
1 parent 935203b commit b68ef92
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
git fetch origin $SOURCE_BRANCH
git merge --no-commit origin/$SOURCE_BRANCH
git checkout edge -- bicepconfig.json
git commit -m "Upmerge to edge"
git commit --signoff --message "Upmerge to edge"
if git diff --quiet edge; then
echo "No changes to merge from $SOURCE_BRANCH to edge"
Expand Down
30 changes: 15 additions & 15 deletions samples/dapr/nodeapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion samples/dapr/nodeapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"license": "ISC",
"dependencies": {
"body-parser": "^1.20.3",
"express": "^4.21.0",
"express": "^4.21.1",
"isomorphic-fetch": "^3.0.0"
}
}
24 changes: 12 additions & 12 deletions samples/demo/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b68ef92

Please sign in to comment.