Merge pull request #22724 from Expensify/Rory-FixCPResolveConflicts

[No QA] Fix CP conflict resolution
Expensify · Jul 12, 2023 · 105ba31 · 105ba31
2 parents 089cf7e + de52f1f
commit 105ba31
Show file tree

Hide file tree

Showing 10 changed files with 5,008 additions and 20 deletions.
diff --git a/.github/actions/javascript/bumpVersion/bumpVersion.js b/.github/actions/javascript/bumpVersion/bumpVersion.js
@@ -42,8 +42,8 @@ function updateNativeVersions(version) {
 
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', {require: true});
 if (!semanticVersionLevel || !_.contains(versionUpdater.SEMANTIC_VERSION_LEVELS, semanticVersionLevel)) {
-    console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD}`);
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
+    console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
 const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json'));

diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
@@ -52,8 +52,8 @@ function updateNativeVersions(version) {
 
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', {require: true});
 if (!semanticVersionLevel || !_.contains(versionUpdater.SEMANTIC_VERSION_LEVELS, semanticVersionLevel)) {
-    console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD}`);
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
+    console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
 const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json'));

diff --git a/.github/actions/javascript/getPreviousVersion/action.yml b/.github/actions/javascript/getPreviousVersion/action.yml
@@ -0,0 +1,12 @@
+name: 'Get previous npm version'
+description: 'Get the previous app version.'
+inputs:
+  SEMVER_LEVEL:
+    description: Semantic Versioning Level
+    required: true
+outputs:
+  PREVIOUS_VERSION:
+    description: The previous semver version of the application, according to the SEMVER_LEVEL provided
+runs:
+  using: 'node16'
+  main: './index.js'
diff --git a/.github/actions/javascript/getPreviousVersion/getPreviousVersion.js b/.github/actions/javascript/getPreviousVersion/getPreviousVersion.js
@@ -0,0 +1,13 @@
+const {readFileSync} = require('fs');
+const core = require('@actions/core');
+const _ = require('underscore');
+const versionUpdater = require('../../../libs/versionUpdater');
+
+const semverLevel = core.getInput('SEMVER_LEVEL', {require: true});
+if (!semverLevel || !_.contains(versionUpdater.SEMANTIC_VERSION_LEVELS, semverLevel)) {
+    core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
+}
+
+const {version: currentVersion} = JSON.parse(readFileSync('./package.json'));
+const previousVersion = versionUpdater.getPreviousVersion(currentVersion, semverLevel);
+core.setOutput('PREVIOUS_VERSION', previousVersion);