Upmerge to edge

Signed-off-by: Radius CI Bot <[email protected]>
radius-project · Dec 6, 2024 · 069ff92 · 069ff92
2 parents 935203b + 4b69d84
commit 069ff92
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
@@ -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"

diff --git a/samples/dapr/nodeapp/package-lock.json b/samples/dapr/nodeapp/package-lock.json
diff --git a/samples/dapr/nodeapp/package.json b/samples/dapr/nodeapp/package.json
@@ -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"
   }
 }
diff --git a/samples/demo/client/package-lock.json b/samples/demo/client/package-lock.json