Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to leverage pnpm for monorepo #37259

Merged
merged 35 commits into from
May 29, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
c219beb
Update to leverage pnpm for monorepo
ijjk May 28, 2022
65d85b1
update compiled
ijjk May 28, 2022
9a322fc
update stats action
ijjk May 28, 2022
cb81d92
update ci install step
ijjk May 28, 2022
4579487
update ci
ijjk May 28, 2022
1765a75
add test dep
ijjk May 28, 2022
7f5be35
update invoking scripts
ijjk May 28, 2022
ac670e9
update caching
ijjk May 28, 2022
ccbb9d7
skip cache for now
ijjk May 28, 2022
44d9c73
update dep
ijjk May 28, 2022
9415a05
update packages and fix babel
ijjk May 28, 2022
50b2240
update compiled
ijjk May 28, 2022
6c5cd4e
update lint
ijjk May 28, 2022
f5e73f8
update test
ijjk May 28, 2022
6c59acf
update ci
ijjk May 28, 2022
bc7b937
update pnpm store caching
ijjk May 28, 2022
3ef07ee
update path for windows
ijjk May 28, 2022
32f40d0
update restore-key config
ijjk May 28, 2022
20cee43
update caching
ijjk May 28, 2022
9a931c1
remove extra build azure stage
ijjk May 28, 2022
08e4d22
re-add checkout
ijjk May 28, 2022
c3b14d2
update setting pnpm store
ijjk May 28, 2022
95e9968
bump
ijjk May 28, 2022
ec48bf3
remove azure caching as pnpm is faster to download
ijjk May 28, 2022
9d8123e
update contributing
ijjk May 28, 2022
eab1ce7
apply suggestions
ijjk May 28, 2022
11cd69f
remove install-peers
ijjk May 28, 2022
41c8f8f
prepublish -> prepublishOnly
ijjk May 28, 2022
10973f9
prepublish -> prepublishOnly more
ijjk May 28, 2022
56c938c
more yarn -> pnpm references
ijjk May 28, 2022
3072628
more yarn -> pnpm references take 2
ijjk May 28, 2022
d2555f4
use workspace protocol for root package.json
ijjk May 29, 2022
6f0710a
Merge branch 'canary' into update/use-pnpm
ijjk May 29, 2022
e055947
Merge branch 'canary' into update/use-pnpm
ijjk May 29, 2022
99a7423
Merge branch 'canary' into update/use-pnpm
styfle May 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update stats action
  • Loading branch information
ijjk committed May 28, 2022
commit 9a322fcc3a4fad3f74ff95676df073d00de8a521
3 changes: 2 additions & 1 deletion .github/actions/next-stats-action/src/constants.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
const path = require('path')
const os = require('os')

const benchTitle = 'Page Load Tests'
const workDir = path.join(__dirname, '../.work')
const workDir = path.join(os.tmpdir(), 'next-stats')
const mainRepoName = 'main-repo'
const diffRepoName = 'diff-repo'
const mainRepoDir = path.join(workDir, mainRepoName)
Expand Down
21 changes: 11 additions & 10 deletions .github/actions/next-stats-action/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,12 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
for (const dir of repoDirs) {
logger(`Running initial build for ${dir}`)
if (!actionInfo.skipClone) {
const usePnpm = await fs.pathExists(path.join(dir, 'pnpm-lock.yaml'))
let buildCommand = `cd ${dir}${
!statsConfig.skipInitialInstall
? ' && pnpm install --network-timeout 1000000'
? usePnpm
? ' && pnpm install && pnpm run build'
: ' && yarn install --network-timeout 1000000'
: ''
}`

Expand All @@ -118,15 +121,13 @@ 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-swc/native')
)
// TODO: remove after next stable release (current v12.0.4)
await fs.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next/native')
)

await fs
.copy(
path.join(__dirname, '../native'),
path.join(dir, 'packages/next-swc/native')
)
.catch(console.error)

logger(`Linking packages in ${dir}`)
const pkgPaths = await linkPackages(dir)
Expand Down