-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
530 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| version: 0.2 | ||
| env: | ||
| shell: bash | ||
| git-credential-helper: yes | ||
| phases: | ||
| build: | ||
| commands: | ||
| - source ./shared-scripts.sh && _deprecate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| version: 0.2 | ||
| env: | ||
| shell: bash | ||
| compute-type: BUILD_GENERAL1_SMALL | ||
|
|
||
| batch: | ||
| fast-fail: false | ||
| build-graph: | ||
| - identifier: install_linux | ||
| buildspec: .codebuild/install_linux.yml | ||
| - identifier: deprecate | ||
| buildspec: .codebuild/deprecate.yml | ||
| depend-on: | ||
| - install_linux |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| version: 0.2 | ||
| env: | ||
| shell: bash | ||
| phases: | ||
| build: | ||
| commands: | ||
| - source ./shared-scripts.sh && _installLinux | ||
| artifacts: | ||
| files: | ||
| - 'shared-scripts.sh' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import { EOL } from 'os'; | ||
| import { NpmClient } from './npm_client.js'; | ||
| import { releaseTagToNameAndVersion } from './release_tag_to_name_and_version'; | ||
|
|
||
| type DistTagMoveAction = { | ||
| /** | ||
| * An NPM dist-tag | ||
| */ | ||
| distTag: string; | ||
| /** | ||
| * This is a string of the form <packageName>@<version> | ||
| */ | ||
| releaseTag: string; | ||
| }; | ||
|
|
||
| /** | ||
| * Handles moving npm dist-tags from one package version to another | ||
| */ | ||
| export class DistTagMover { | ||
| /** | ||
| * Initialize with an npmClient | ||
| */ | ||
| constructor(private readonly npmClient: NpmClient) {} | ||
|
|
||
| /** | ||
| * Given a list of sourceReleaseTags and destReleaseTags, | ||
| * any npm dist-tags that are pointing to a sourceReleaseTag will be moved to point to the corresponding destReleaseTag | ||
| */ | ||
| moveDistTags = async (sourceReleaseTags: string[], destReleaseTags: string[]) => { | ||
| const moveActions: DistTagMoveAction[] = []; | ||
|
|
||
| for (const sourceReleaseTag of sourceReleaseTags) { | ||
| const { packageName, version: sourceVersion } = releaseTagToNameAndVersion(sourceReleaseTag); | ||
|
|
||
| const { 'dist-tags': distTags } = await this.npmClient.getPackageInfo(sourceReleaseTag); | ||
|
|
||
| Object.entries(distTags).forEach(([tagName, versionAtTag]) => { | ||
| if (versionAtTag !== sourceVersion) { | ||
| return; | ||
| } | ||
| const destReleaseTag = destReleaseTags.find(releaseTag => releaseTag.includes(packageName)); | ||
| if (!destReleaseTag) { | ||
| console.warn(`No corresponding destination release tag found for ${sourceReleaseTag}. latest tag not moved.`); | ||
| } else { | ||
| moveActions.push({ | ||
| releaseTag: destReleaseTag, | ||
| distTag: tagName, | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| for (const { distTag, releaseTag } of moveActions) { | ||
| console.log(`Moving dist tag "${distTag}" to release tag ${releaseTag}`); | ||
| await this.npmClient.setDistTag(releaseTag, distTag); | ||
| console.log(`Done!${EOL}`); | ||
| } | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,209 @@ | ||
| const execa = require('execa'); | ||
| import { writeFile } from 'fs/promises'; | ||
| import { EOL } from 'os'; | ||
| import * as path from 'path'; | ||
| import { releaseTagToNameAndVersion } from './release_tag_to_name_and_version'; | ||
| import privatePackages from './private_packages'; | ||
|
|
||
| /** | ||
| * Client for programmatically interacting with the local git cli | ||
| */ | ||
| export class GitClient { | ||
| private readonly gitignorePath: string; | ||
|
|
||
| /** | ||
| * execaCommand that allows us to capture stdout | ||
| */ | ||
| private readonly exec; | ||
|
|
||
| /** | ||
| * execaCommand that pipes buffers to process buffers | ||
| */ | ||
| private readonly execWithIO; | ||
|
|
||
| /** | ||
| * Initialize with an optional directory to operate in. | ||
| * Defaults to the process cwd. | ||
| */ | ||
| constructor(cwd?: string) { | ||
| this.exec = (command: string, args: string[]) => execa.sync(command, args, { cwd }); | ||
| this.execWithIO = (command: string, args: string[]) => execa.sync(command, args, { cwd, stdio: 'inherit' }); | ||
| this.gitignorePath = cwd ? path.join(cwd, '.gitignore') : '.gitignore'; | ||
| } | ||
|
|
||
| init = async () => { | ||
| await this.exec('git', ['init']); | ||
| await writeFile(this.gitignorePath, `node_modules${EOL}`); | ||
| }; | ||
|
|
||
| /** | ||
| * Throws if there are uncommitted changes in the repo | ||
| */ | ||
| ensureWorkingTreeIsClean = async () => { | ||
| const { stdout } = await this.exec('git', ['status', '--porcelain']); | ||
| const isDirty = stdout.trim(); | ||
| if (isDirty) { | ||
| throw new Error('Dirty working tree detected. Commit or stash changes to continue.'); | ||
| } | ||
| }; | ||
|
|
||
| getCurrentBranch = async () => { | ||
| const { stdout: currentBranch } = await this.exec('git', ['branch', '--show-current']); | ||
| return currentBranch; | ||
| }; | ||
|
|
||
| /** | ||
| * Switches to branchName. Creates the branch if it does not exist. | ||
| */ | ||
| switchToBranch = async (branchName: string) => { | ||
| const { stdout: branchResult } = await this.exec('git', ['branch', '-l', branchName]); | ||
| const branchExists = branchResult.trim().length > 0; | ||
| if (branchExists) { | ||
| await this.execWithIO('git', ['switch', branchName]); | ||
| } else { | ||
| await this.execWithIO('git', ['switch', '-c', branchName]); | ||
| } | ||
| }; | ||
|
|
||
| /** | ||
| * Stages and commits all current changes | ||
| */ | ||
| commitAllChanges = async (message: string) => { | ||
| await this.execWithIO('git', ['add', '.']); | ||
| await this.execWithIO('git', ['commit', '--message', message, '--allow-empty']); | ||
| }; | ||
|
|
||
| /** | ||
| * Push to the remote | ||
| */ | ||
| push = async ({ force }: { force: boolean } = { force: false }) => { | ||
| await this.execWithIO('git', ['push', force ? '--force' : '']); | ||
| }; | ||
|
|
||
| fetchTags = async () => { | ||
| await this.execWithIO('git', ['fetch', '--tags']); | ||
| }; | ||
|
|
||
| checkout = async (ref: string, paths: string[] = []) => { | ||
| const additionalArgs = paths.length > 0 ? ['--', ...paths] : []; | ||
| await this.execWithIO('git', ['checkout', ref, ...additionalArgs]); | ||
| }; | ||
|
|
||
| status = async () => { | ||
| await this.execWithIO('git', ['status']); | ||
| }; | ||
|
|
||
| /** | ||
| * Returns a list of tags that point to the given commit | ||
| */ | ||
| getTagsAtCommit = async (commitHash: string) => { | ||
| const { stdout: tagsString } = await this.exec('git', ['tag', '--points-at', commitHash]); | ||
| return ( | ||
| tagsString | ||
| .split(EOL) | ||
| .filter((line: string) => line.trim().length > 0) | ||
| // filter out packages not published to npm | ||
| .filter((tag: string) => !privatePackages.some(name => tag.includes(name))) | ||
| ); | ||
| }; | ||
|
|
||
| /** | ||
| * Gets the most recent release commit that is reachable from the input commitHash | ||
| * If no commitHash is specified, HEAD is used as the default | ||
| * By default, the input commitHash is considered in the search (ie if commitHash is a release commit, that commit will be returned) | ||
| * To search for the most recent release commit EXCLUDING commitHash, set inclusive=false | ||
| */ | ||
| getNearestReleaseCommit = async (commitHash: string = 'HEAD', { inclusive }: { inclusive: boolean } = { inclusive: true }) => { | ||
| // get the most recent tag before (or at if inclusive=false) the current release tag | ||
| const { stdout: previousReleaseTag } = await this.exec('git', ['describe', `${commitHash}${inclusive ? '' : '^'}`, '--abbrev=0']); | ||
|
|
||
| // get the commit hash associated with the previous release tag | ||
| const { stdout: previousReleaseCommitHash } = await this.exec('git', ['log', '-1', previousReleaseTag, '--pretty=%H']); | ||
|
|
||
| // run some sanity checks on the release commit | ||
| await this.validateReleaseCommitHash(previousReleaseCommitHash); | ||
|
|
||
| return previousReleaseCommitHash; | ||
| }; | ||
|
|
||
| /** | ||
| * Given a release commit hash A that has tags for one or more package versions, | ||
| * walk through release history and find the previous release tags of all of the packages that were released in commit A | ||
| * | ||
| * Note that this does not mean just looking up the previous release tags. | ||
| * It may be the case that package-A was released in release-5 but the previous release of package-A happened in release-2. | ||
| * This method will walk through past release tags until it finds the previous version of all of the input package versions | ||
| * If a previous version of some package cannot be found, a warning is printed. | ||
| */ | ||
| getPreviousReleaseTags = async (releaseCommitHash: string) => { | ||
| await this.validateReleaseCommitHash(releaseCommitHash); | ||
| const releaseTags = await this.getTagsAtCommit(releaseCommitHash); | ||
|
|
||
| // create a set of just the package names (strip off the version suffix) associated with this release commit | ||
| const packageNamesRemaining = new Set(releaseTags.map(releaseTagToNameAndVersion).map(nameAndVersion => nameAndVersion.packageName)); | ||
|
|
||
| let releaseCommitCursor = releaseCommitHash; | ||
|
|
||
| // the method return value that we will append release tags to in the loop | ||
| const previousReleaseTags: string[] = []; | ||
|
|
||
| while (packageNamesRemaining.size > 0) { | ||
| try { | ||
| releaseCommitCursor = await this.getNearestReleaseCommit(releaseCommitCursor, { inclusive: false }); | ||
| const releaseTagsAtCursor = await this.getTagsAtCommit(releaseCommitCursor); | ||
| releaseTagsAtCursor.forEach(releaseTag => { | ||
| const { packageName } = releaseTagToNameAndVersion(releaseTag); | ||
| if (packageNamesRemaining.has(packageName)) { | ||
| // this means we've found the previous version of "packageNameRemaining" that was released in releaseCommitHash | ||
| // so we add it to the return list and remove it from the search set | ||
| previousReleaseTags.push(releaseTag); | ||
| packageNamesRemaining.delete(packageName); | ||
| } | ||
| }); | ||
| } catch { | ||
| console.warn(`Previous release not found for ${packageNamesRemaining}.`); | ||
| packageNamesRemaining.clear(); | ||
| } | ||
| } | ||
|
|
||
| return previousReleaseTags; | ||
| }; | ||
|
|
||
| private validateReleaseCommitHash = async (releaseCommitHash: string) => { | ||
| // check that the hash points to a valid commit | ||
| const { stdout: hashType } = await this.exec('git', ['cat-file', '-t', releaseCommitHash]); | ||
| if (hashType !== 'commit') { | ||
| throw new Error(`Hash ${releaseCommitHash} does not point to a commit in the git tree`); | ||
| } | ||
|
|
||
| // check that the commit hash points to a release commit | ||
| const { stdout: commitMessage } = await this.exec('git', ['log', '-1', '--pretty="%s"', releaseCommitHash]); | ||
| if (!commitMessage.includes('chore(release)')) { | ||
| throw new Error(` | ||
| Expected release commit message to include "chore(release)". | ||
| Instead found ${commitMessage}. | ||
| Make sure commit ${releaseCommitHash} points to a release commit. | ||
| `); | ||
| } | ||
|
|
||
| // check that this commit was made by the amplify-data-ci bot | ||
| const { stdout: commitAuthor } = await this.exec('git', ['log', '-1', '--pretty="%an"', releaseCommitHash]); | ||
| if (!commitAuthor.includes('amplify-data-ci')) { | ||
| throw new Error(` | ||
| Expected release commit commit to be authored by amplify-data-ci. | ||
| Instead found ${commitAuthor}. | ||
| Make sure commit ${releaseCommitHash} points to a release commit. | ||
| `); | ||
| } | ||
|
|
||
| // get the release tags associated with the commit | ||
| const releaseTags = await this.getTagsAtCommit(releaseCommitHash); | ||
|
|
||
| if (releaseTags.length === 0) { | ||
| throw new Error(` | ||
| Expected release commit to have associated git tags but none found. | ||
| Make sure commit ${releaseCommitHash} points to a release commit. | ||
| `); | ||
| } | ||
| }; | ||
| } |
Oops, something went wrong.