Skip to content

Commit

Permalink
Merge branch 'canary' into kdy1/swc-core-79
Browse files Browse the repository at this point in the history
  • Loading branch information
alexkirsz committed Jul 7, 2023
2 parents c7525a9 + b0e4d8e commit bdc098d
Show file tree
Hide file tree
Showing 298 changed files with 17,416 additions and 9,568 deletions.
4 changes: 2 additions & 2 deletions .github/actions/next-stats-action/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ if (!allowedActions.has(actionInfo.actionName) && !actionInfo.isRelease) {
let mainRef = statsConfig.mainBranch

if (actionInfo.isRelease) {
logger('Release detected, using last stable tag')
logger(`Release detected, using last stable tag: "${actionInfo.prRef}"`)
const lastStableTag = await getLastStable(diffRepoDir, actionInfo.prRef)
mainRef = lastStableTag
mainNextSwcVersion = lastStableTag
if (!lastStableTag) throw new Error('failed to get last stable tag')
console.log('using latestStable', lastStableTag)
logger(`using latestStable: "${lastStableTag}"`)

/* eslint-disable-next-line */
actionInfo.lastStableTag = lastStableTag
Expand Down
11 changes: 8 additions & 3 deletions .github/actions/next-stats-action/src/prepare/repo-setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@ module.exports = (actionInfo) => {
const tag = stdout.trim()

if (!tag || !tag.startsWith('v')) {
throw new Error(`Failed to get tag info ${stdout}`)
throw new Error(`Failed to get tag info: "${stdout}"`)
}
const [major, minor, patch] = tag.split('-canary')[0].split('.')
if (!major || !minor || !patch) {
throw new Error(
`Failed to split tag into major/minor/patch: "${stdout}"`
)
}
const tagParts = tag.split('-canary')[0].split('.')
// last stable tag will always be 1 patch less than canary
return `${tagParts[0]}.${tagParts[1]}.${Number(tagParts[2]) - 1}`
return `${major}.${minor}.${Number(patch) - 1}`
},
async getCommitId(repoDir = '') {
const { stdout } = await exec(`cd ${repoDir} && git rev-parse HEAD`)
Expand Down
71 changes: 36 additions & 35 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ swc_core = { version = "0.79.13" }
testing = { version = "0.33.20" }

# Turbo crates
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.5" }
turbopack-binding = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230706.3" }
# [TODO]: need to refactor embed_directory! macro usages, as well as resolving turbo_tasks::function, macros..
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.5" }
turbo-tasks = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230706.3" }
# [TODO]: need to refactor embed_directory! macro usage in next-core
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230704.5" }
turbo-tasks-fs = { git = "https://github.com/vercel/turbo.git", tag = "turbopack-230706.3" }

# General Deps

Expand Down

0 comments on commit bdc098d

Please sign in to comment.