Skip to content

Commit

Permalink
Merge branch 'canary' into webpack/upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
ijjk authored Oct 29, 2021
2 parents 832ff22 + b5a8916 commit a432bda
Show file tree
Hide file tree
Showing 16 changed files with 389 additions and 183 deletions.
4 changes: 4 additions & 0 deletions .github/actions/next-stats-action/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
// in case of noisy environment slowing down initial repo build
await exec(buildCommand, false, { timeout: 5 * 60 * 1000 })
}
await fs.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next/native')
)

logger(`Linking packages in ${dir}`)
const pkgPaths = await linkPackages(dir)
Expand Down
4 changes: 4 additions & 0 deletions .github/actions/next-stats-action/src/prepare/repo-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@ module.exports = (actionInfo) => {
// make sure native binaries are included in local linking
if (pkg === 'next') {
pkgData.files.push('native')
console.log(
'using swc binaries: ',
await exec(`ls ${path.join(path.dirname(pkgDataPath), 'native')}`)
)
}
await fs.writeFile(
pkgDataPath,
Expand Down
107 changes: 0 additions & 107 deletions .github/workflows/build_native.yml

This file was deleted.

Loading

0 comments on commit a432bda

Please sign in to comment.