Skip to content

Commit

Permalink
Bypass tag check in dry run (facebook#35428) (facebook#35470)
Browse files Browse the repository at this point in the history
Summary:
When dry-run in stable branch, the tag already exists. We are bypassing the tag-existence check when in a dry-run to have the CI pass

## Changelog

[General] [Fixed] - Bypass tag version check when dry-run

Pull Request resolved: facebook#35470

Test Plan:
CircleCI
It worked for RC1 and RC2

Reviewed By: cortinico

Differential Revision: D41529648

Pulled By: cipolleschi

fbshipit-source-id: d4d7f5534f86c2cf10b05e0d4cab950e4902d8df
  • Loading branch information
Riccardo authored and OlimpiaZurek committed May 22, 2023
1 parent 6deb1ba commit efd8987
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion scripts/bump-oss-version.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ async function main() {
);
const token = argv.token;
const releaseVersion = argv.toVersion;
failIfTagExists(releaseVersion);
failIfTagExists(releaseVersion, 'release');

const {pushed} = await inquirer.prompt({
type: 'confirm',
Expand Down
14 changes: 7 additions & 7 deletions scripts/prepare-package-for-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,13 @@ const releaseVersion = argv.toVersion;
const isLatest = argv.latest;
const isDryRun = argv.dryRun;

failIfTagExists(releaseVersion);
const buildType = isDryRun
? 'dry-run'
: isReleaseBranch(branch)
? 'release'
: 'nightly';

failIfTagExists(releaseVersion, buildType);

if (branch && !isReleaseBranch(branch) && !isDryRun) {
console.error(`This needs to be on a release branch. On branch: ${branch}`);
Expand All @@ -60,12 +66,6 @@ if (branch && !isReleaseBranch(branch) && !isDryRun) {
exit(1);
}

const buildType = isDryRun
? 'dry-run'
: isReleaseBranch(branch)
? 'release'
: 'nightly';

const {version} = parseVersion(releaseVersion, buildType);
if (version == null) {
console.error(`Invalid version provided: ${releaseVersion}`);
Expand Down
8 changes: 7 additions & 1 deletion scripts/release-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,13 @@ function generateiOSArtifacts(
return tarballOutputPath;
}

function failIfTagExists(version) {
function failIfTagExists(version, buildType) {
// When dry-run in stable branch, the tag already exists.
// We are bypassing the tag-existence check when in a dry-run to have the CI pass
if (buildType === 'dry-run') {
return;
}

if (checkIfTagExists(version)) {
echo(`Tag v${version} already exists.`);
echo('You may want to rollback the last commit');
Expand Down

0 comments on commit efd8987

Please sign in to comment.