Merge branch 'canary' into test-deploy-datadog

vercel · Jun 11, 2023 · d144bb9 · d144bb9
2 parents 1aba6ab + cfd64aa
commit d144bb9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/actions/next-stats-action/src/index.js b/.github/actions/next-stats-action/src/index.js
@@ -73,7 +73,7 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
 
       if (actionInfo.isRelease) {
         logger('Release detected, using last stable tag')
-        const lastStableTag = await getLastStable(mainRepoDir, actionInfo.prRef)
+        const lastStableTag = await getLastStable(diffRepoDir, actionInfo.prRef)
         mainRef = lastStableTag
         mainNextSwcVersion = lastStableTag
         if (!lastStableTag) throw new Error('failed to get last stable tag')

diff --git a/packages/next/src/lib/metadata/get-metadata-route.ts b/packages/next/src/lib/metadata/get-metadata-route.ts
@@ -4,6 +4,7 @@ import { interpolateDynamicPath } from '../../server/server-utils'
 import { getNamedRouteRegex } from '../../shared/lib/router/utils/route-regex'
 import { djb2Hash } from '../../shared/lib/hash'
 import { normalizeAppPath } from '../../shared/lib/router/utils/app-paths'
+import { normalizePathSep } from '../../shared/lib/page-path/normalize-path-sep'
 
 /*
  * If there's special convention like (...) or @ in the page path,
@@ -42,7 +43,7 @@ export function fillMetadataSegment(
 
   const { name, ext } = path.parse(imageSegment)
 
-  return path.join(route, `${name}${routeSuffix}${ext}`)
+  return normalizePathSep(path.join(route, `${name}${routeSuffix}${ext}`))
 }
 
 /**