From 83c79d6b61320b236a8616add35df1a82e53f3c6 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Tue, 28 Jun 2022 15:18:14 -0700 Subject: [PATCH 1/4] Move JS actions to .github/actions/javascript --- .../awaitStagingDeploys/action.yml | 0 .../awaitStagingDeploys/awaitStagingDeploys.js | 6 +++--- .../{ => javascript}/awaitStagingDeploys/index.js | 4 ++-- .../{ => javascript}/bumpVersion/action.yml | 0 .../{ => javascript}/bumpVersion/bumpVersion.js | 4 ++-- .../actions/{ => javascript}/bumpVersion/index.js | 4 ++-- .../checkBundleVersionStringMatch/action.yml | 0 .../checkBundleVersionStringMatch.js | 2 +- .../checkBundleVersionStringMatch/index.js | 4 ++-- .../checkDeployBlockers/action.yml | 0 .../checkDeployBlockers/checkDeployBlockers.js | 2 +- .../{ => javascript}/checkDeployBlockers/index.js | 4 ++-- .../createOrUpdateStagingDeploy/action.yml | 0 .../createOrUpdateStagingDeploy.js | 4 ++-- .../createOrUpdateStagingDeploy/index.js | 4 ++-- .../getDeployPullRequestList/action.yml | 0 .../getDeployPullRequestList.js | 4 ++-- .../getDeployPullRequestList/index.js | 4 ++-- .../getPullRequestDetails/action.yml | 0 .../getPullRequestDetails/getPullRequestDetails.js | 4 ++-- .../getPullRequestDetails/index.js | 4 ++-- .../{ => javascript}/getReleaseBody/action.yml | 0 .../getReleaseBody/getReleaseBody.js | 4 ++-- .../{ => javascript}/getReleaseBody/index.js | 4 ++-- .../isPullRequestMergeable/action.yml | 0 .../isPullRequestMergeable/index.js | 4 ++-- .../isPullRequestMergeable.js | 4 ++-- .../isStagingDeployLocked/action.yml | 0 .../isStagingDeployLocked/index.js | 4 ++-- .../isStagingDeployLocked/isStagingDeployLocked.js | 2 +- .../markPullRequestsAsDeployed/action.yml | 0 .../markPullRequestsAsDeployed/index.js | 4 ++-- .../markPullRequestsAsDeployed.js | 4 ++-- .../reopenIssueWithComment/action.yml | 0 .../reopenIssueWithComment/index.js | 4 ++-- .../reopenIssueWithComment.js | 2 +- .../triggerWorkflowAndWait/action.yml | 0 .../triggerWorkflowAndWait/index.js | 4 ++-- .../triggerWorkflowAndWait.js | 6 +++--- .../verifySignedCommits/action.yml | 0 .../{ => javascript}/verifySignedCommits/index.js | 4 ++-- .../verifySignedCommits/verifySignedCommits.js | 2 +- .github/scripts/buildActions.sh | 2 +- .github/workflows/README.md | 4 ++-- .github/workflows/cherryPick.yml | 10 +++++----- .github/workflows/createNewVersion.yml | 4 ++-- .github/workflows/deploy.yml | 4 ++-- .github/workflows/deployBlocker.yml | 2 +- .github/workflows/finishReleaseCycle.yml | 14 +++++++------- .github/workflows/lockDeploys.yml | 2 +- .github/workflows/platformDeploy.yml | 4 ++-- .github/workflows/preDeploy.yml | 12 ++++++------ .github/workflows/updateProtectedBranch.yml | 2 +- .github/workflows/verifySignedCommits.yml | 2 +- 54 files changed, 84 insertions(+), 84 deletions(-) rename .github/actions/{ => javascript}/awaitStagingDeploys/action.yml (100%) rename .github/actions/{ => javascript}/awaitStagingDeploys/awaitStagingDeploys.js (92%) rename .github/actions/{ => javascript}/awaitStagingDeploys/index.js (99%) rename .github/actions/{ => javascript}/bumpVersion/action.yml (100%) rename .github/actions/{ => javascript}/bumpVersion/bumpVersion.js (95%) rename .github/actions/{ => javascript}/bumpVersion/index.js (99%) rename .github/actions/{ => javascript}/checkBundleVersionStringMatch/action.yml (100%) rename .github/actions/{ => javascript}/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js (93%) rename .github/actions/{ => javascript}/checkBundleVersionStringMatch/index.js (99%) rename .github/actions/{ => javascript}/checkDeployBlockers/action.yml (100%) rename .github/actions/{ => javascript}/checkDeployBlockers/checkDeployBlockers.js (97%) rename .github/actions/{ => javascript}/checkDeployBlockers/index.js (99%) rename .github/actions/{ => javascript}/createOrUpdateStagingDeploy/action.yml (100%) rename .github/actions/{ => javascript}/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js (98%) rename .github/actions/{ => javascript}/createOrUpdateStagingDeploy/index.js (99%) rename .github/actions/{ => javascript}/getDeployPullRequestList/action.yml (100%) rename .github/actions/{ => javascript}/getDeployPullRequestList/getDeployPullRequestList.js (95%) rename .github/actions/{ => javascript}/getDeployPullRequestList/index.js (99%) rename .github/actions/{ => javascript}/getPullRequestDetails/action.yml (100%) rename .github/actions/{ => javascript}/getPullRequestDetails/getPullRequestDetails.js (95%) rename .github/actions/{ => javascript}/getPullRequestDetails/index.js (99%) rename .github/actions/{ => javascript}/getReleaseBody/action.yml (100%) rename .github/actions/{ => javascript}/getReleaseBody/getReleaseBody.js (79%) rename .github/actions/{ => javascript}/getReleaseBody/index.js (99%) rename .github/actions/{ => javascript}/isPullRequestMergeable/action.yml (100%) rename .github/actions/{ => javascript}/isPullRequestMergeable/index.js (99%) rename .github/actions/{ => javascript}/isPullRequestMergeable/isPullRequestMergeable.js (94%) rename .github/actions/{ => javascript}/isStagingDeployLocked/action.yml (100%) rename .github/actions/{ => javascript}/isStagingDeployLocked/index.js (99%) rename .github/actions/{ => javascript}/isStagingDeployLocked/isStagingDeployLocked.js (92%) rename .github/actions/{ => javascript}/markPullRequestsAsDeployed/action.yml (100%) rename .github/actions/{ => javascript}/markPullRequestsAsDeployed/index.js (99%) rename .github/actions/{ => javascript}/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js (98%) rename .github/actions/{ => javascript}/reopenIssueWithComment/action.yml (100%) rename .github/actions/{ => javascript}/reopenIssueWithComment/index.js (99%) rename .github/actions/{ => javascript}/reopenIssueWithComment/reopenIssueWithComment.js (95%) rename .github/actions/{ => javascript}/triggerWorkflowAndWait/action.yml (100%) rename .github/actions/{ => javascript}/triggerWorkflowAndWait/index.js (99%) rename .github/actions/{ => javascript}/triggerWorkflowAndWait/triggerWorkflowAndWait.js (97%) rename .github/actions/{ => javascript}/verifySignedCommits/action.yml (100%) rename .github/actions/{ => javascript}/verifySignedCommits/index.js (99%) rename .github/actions/{ => javascript}/verifySignedCommits/verifySignedCommits.js (93%) diff --git a/.github/actions/awaitStagingDeploys/action.yml b/.github/actions/javascript/awaitStagingDeploys/action.yml similarity index 100% rename from .github/actions/awaitStagingDeploys/action.yml rename to .github/actions/javascript/awaitStagingDeploys/action.yml diff --git a/.github/actions/awaitStagingDeploys/awaitStagingDeploys.js b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.js similarity index 92% rename from .github/actions/awaitStagingDeploys/awaitStagingDeploys.js rename to .github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.js index d71bf68c0812..067d2812be3b 100644 --- a/.github/actions/awaitStagingDeploys/awaitStagingDeploys.js +++ b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.js @@ -1,7 +1,7 @@ const _ = require('underscore'); -const ActionUtils = require('../../libs/ActionUtils'); -const GitHubUtils = require('../../libs/GithubUtils'); -const {promiseDoWhile} = require('../../libs/promiseWhile'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GitHubUtils = require('../../../libs/GithubUtils'); +const {promiseDoWhile} = require('../../../libs/promiseWhile'); function run() { const tag = ActionUtils.getStringInput('TAG', {required: false}); diff --git a/.github/actions/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js similarity index 99% rename from .github/actions/awaitStagingDeploys/index.js rename to .github/actions/javascript/awaitStagingDeploys/index.js index f1f58f36a7f4..728589d2a2b7 100644 --- a/.github/actions/awaitStagingDeploys/index.js +++ b/.github/actions/javascript/awaitStagingDeploys/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 1738: +/***/ 1021: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12224,6 +12224,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(1738); +/******/ return __nccwpck_require__(1021); /******/ })() ; diff --git a/.github/actions/bumpVersion/action.yml b/.github/actions/javascript/bumpVersion/action.yml similarity index 100% rename from .github/actions/bumpVersion/action.yml rename to .github/actions/javascript/bumpVersion/action.yml diff --git a/.github/actions/bumpVersion/bumpVersion.js b/.github/actions/javascript/bumpVersion/bumpVersion.js similarity index 95% rename from .github/actions/bumpVersion/bumpVersion.js rename to .github/actions/javascript/bumpVersion/bumpVersion.js index 40bf7d926472..f3fd423bcee0 100644 --- a/.github/actions/bumpVersion/bumpVersion.js +++ b/.github/actions/javascript/bumpVersion/bumpVersion.js @@ -3,8 +3,8 @@ const fs = require('fs'); const exec = promisify(require('child_process').exec); const _ = require('underscore'); const core = require('@actions/core'); -const versionUpdater = require('../../libs/versionUpdater'); -const {updateAndroidVersion, updateiOSVersion, generateAndroidVersionCode} = require('../../libs/nativeVersionUpdater'); +const versionUpdater = require('../../../libs/versionUpdater'); +const {updateAndroidVersion, updateiOSVersion, generateAndroidVersionCode} = require('../../../libs/nativeVersionUpdater'); /** * Update the native app versions. diff --git a/.github/actions/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js similarity index 99% rename from .github/actions/bumpVersion/index.js rename to .github/actions/javascript/bumpVersion/index.js index 372fe3618180..23782de13ef4 100644 --- a/.github/actions/bumpVersion/index.js +++ b/.github/actions/javascript/bumpVersion/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 407: +/***/ 39: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const {promisify} = __nccwpck_require__(669); @@ -3599,6 +3599,6 @@ module.exports = require("util");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(407); +/******/ return __nccwpck_require__(39); /******/ })() ; diff --git a/.github/actions/checkBundleVersionStringMatch/action.yml b/.github/actions/javascript/checkBundleVersionStringMatch/action.yml similarity index 100% rename from .github/actions/checkBundleVersionStringMatch/action.yml rename to .github/actions/javascript/checkBundleVersionStringMatch/action.yml diff --git a/.github/actions/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js b/.github/actions/javascript/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js similarity index 93% rename from .github/actions/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js rename to .github/actions/javascript/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js index 68d42427481e..f92a41497ba3 100644 --- a/.github/actions/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js +++ b/.github/actions/javascript/checkBundleVersionStringMatch/checkBundleVersionStringMatch.js @@ -1,6 +1,6 @@ const core = require('@actions/core'); const {execSync} = require('child_process'); -const {PLIST_PATH} = require('../../libs/nativeVersionUpdater'); +const {PLIST_PATH} = require('../../../libs/nativeVersionUpdater'); const bundleVersion = execSync(`grep -A1 'CFBundleVersion' ${PLIST_PATH} | grep -v 'CFBundleVersion' | sed 's|[,]||g'`).toString().trim(); const shortBundleVersion = execSync(`grep -A1 'CFBundleShortVersionString' ${PLIST_PATH} | grep -v 'CFBundleShortVersionString' | sed 's|[,]||g'`).toString().trim(); diff --git a/.github/actions/checkBundleVersionStringMatch/index.js b/.github/actions/javascript/checkBundleVersionStringMatch/index.js similarity index 99% rename from .github/actions/checkBundleVersionStringMatch/index.js rename to .github/actions/javascript/checkBundleVersionStringMatch/index.js index cf4ccc0c7b5e..f6c37c2a8c43 100644 --- a/.github/actions/checkBundleVersionStringMatch/index.js +++ b/.github/actions/javascript/checkBundleVersionStringMatch/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 330: +/***/ 855: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const core = __nccwpck_require__(186); @@ -1247,6 +1247,6 @@ module.exports = require("path");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(330); +/******/ return __nccwpck_require__(855); /******/ })() ; diff --git a/.github/actions/checkDeployBlockers/action.yml b/.github/actions/javascript/checkDeployBlockers/action.yml similarity index 100% rename from .github/actions/checkDeployBlockers/action.yml rename to .github/actions/javascript/checkDeployBlockers/action.yml diff --git a/.github/actions/checkDeployBlockers/checkDeployBlockers.js b/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.js similarity index 97% rename from .github/actions/checkDeployBlockers/checkDeployBlockers.js rename to .github/actions/javascript/checkDeployBlockers/checkDeployBlockers.js index db156651f9fe..4862f0dd9d58 100644 --- a/.github/actions/checkDeployBlockers/checkDeployBlockers.js +++ b/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.js @@ -1,6 +1,6 @@ const _ = require('underscore'); const core = require('@actions/core'); -const GithubUtils = require('../../libs/GithubUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); const run = function () { const issueNumber = Number(core.getInput('ISSUE_NUMBER', {required: true})); diff --git a/.github/actions/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js similarity index 99% rename from .github/actions/checkDeployBlockers/index.js rename to .github/actions/javascript/checkDeployBlockers/index.js index 0a83f1a48443..6d7c26639615 100644 --- a/.github/actions/checkDeployBlockers/index.js +++ b/.github/actions/javascript/checkDeployBlockers/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 7978: +/***/ 6265: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12145,6 +12145,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(7978); +/******/ return __nccwpck_require__(6265); /******/ })() ; diff --git a/.github/actions/createOrUpdateStagingDeploy/action.yml b/.github/actions/javascript/createOrUpdateStagingDeploy/action.yml similarity index 100% rename from .github/actions/createOrUpdateStagingDeploy/action.yml rename to .github/actions/javascript/createOrUpdateStagingDeploy/action.yml diff --git a/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js similarity index 98% rename from .github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js rename to .github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js index 43992307b912..854349998902 100644 --- a/.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js @@ -1,8 +1,8 @@ const _ = require('underscore'); const core = require('@actions/core'); const moment = require('moment'); -const GithubUtils = require('../../libs/GithubUtils'); -const GitUtils = require('../../libs/GitUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); +const GitUtils = require('../../../libs/GitUtils'); const run = function () { const newVersion = core.getInput('NPM_VERSION'); diff --git a/.github/actions/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js similarity index 99% rename from .github/actions/createOrUpdateStagingDeploy/index.js rename to .github/actions/javascript/createOrUpdateStagingDeploy/index.js index a9fc353de29a..155d321bac76 100644 --- a/.github/actions/createOrUpdateStagingDeploy/index.js +++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 2730: +/***/ 3926: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -18035,6 +18035,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(2730); +/******/ return __nccwpck_require__(3926); /******/ })() ; diff --git a/.github/actions/getDeployPullRequestList/action.yml b/.github/actions/javascript/getDeployPullRequestList/action.yml similarity index 100% rename from .github/actions/getDeployPullRequestList/action.yml rename to .github/actions/javascript/getDeployPullRequestList/action.yml diff --git a/.github/actions/getDeployPullRequestList/getDeployPullRequestList.js b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.js similarity index 95% rename from .github/actions/getDeployPullRequestList/getDeployPullRequestList.js rename to .github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.js index 4a22245f3843..32f0e494c7ad 100644 --- a/.github/actions/getDeployPullRequestList/getDeployPullRequestList.js +++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.js @@ -1,8 +1,8 @@ const _ = require('underscore'); const core = require('@actions/core'); const github = require('@actions/github'); -const ActionUtils = require('../../libs/ActionUtils'); -const GitUtils = require('../../libs/GitUtils'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GitUtils = require('../../../libs/GitUtils'); const octokit = github.getOctokit(core.getInput('GITHUB_TOKEN', {required: true})); const inputTag = core.getInput('TAG', {required: true}); diff --git a/.github/actions/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js similarity index 99% rename from .github/actions/getDeployPullRequestList/index.js rename to .github/actions/javascript/getDeployPullRequestList/index.js index 3b74abe4ab01..d1e1163657a3 100644 --- a/.github/actions/getDeployPullRequestList/index.js +++ b/.github/actions/javascript/getDeployPullRequestList/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 6062: +/***/ 5847: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -8407,6 +8407,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(6062); +/******/ return __nccwpck_require__(5847); /******/ })() ; diff --git a/.github/actions/getPullRequestDetails/action.yml b/.github/actions/javascript/getPullRequestDetails/action.yml similarity index 100% rename from .github/actions/getPullRequestDetails/action.yml rename to .github/actions/javascript/getPullRequestDetails/action.yml diff --git a/.github/actions/getPullRequestDetails/getPullRequestDetails.js b/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js similarity index 95% rename from .github/actions/getPullRequestDetails/getPullRequestDetails.js rename to .github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js index 7c9577550838..cf3f27ee662c 100644 --- a/.github/actions/getPullRequestDetails/getPullRequestDetails.js +++ b/.github/actions/javascript/getPullRequestDetails/getPullRequestDetails.js @@ -1,7 +1,7 @@ const _ = require('underscore'); const core = require('@actions/core'); -const ActionUtils = require('../../libs/ActionUtils'); -const GithubUtils = require('../../libs/GithubUtils'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); const DEFAULT_PAYLOAD = { owner: GithubUtils.GITHUB_OWNER, diff --git a/.github/actions/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js similarity index 99% rename from .github/actions/getPullRequestDetails/index.js rename to .github/actions/javascript/getPullRequestDetails/index.js index c22b32526d9c..24262b7e6bd8 100644 --- a/.github/actions/getPullRequestDetails/index.js +++ b/.github/actions/javascript/getPullRequestDetails/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 1751: +/***/ 8306: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12216,6 +12216,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(1751); +/******/ return __nccwpck_require__(8306); /******/ })() ; diff --git a/.github/actions/getReleaseBody/action.yml b/.github/actions/javascript/getReleaseBody/action.yml similarity index 100% rename from .github/actions/getReleaseBody/action.yml rename to .github/actions/javascript/getReleaseBody/action.yml diff --git a/.github/actions/getReleaseBody/getReleaseBody.js b/.github/actions/javascript/getReleaseBody/getReleaseBody.js similarity index 79% rename from .github/actions/getReleaseBody/getReleaseBody.js rename to .github/actions/javascript/getReleaseBody/getReleaseBody.js index 11d7d8ce8d39..d0b1b4af34c5 100644 --- a/.github/actions/getReleaseBody/getReleaseBody.js +++ b/.github/actions/javascript/getReleaseBody/getReleaseBody.js @@ -1,7 +1,7 @@ const _ = require('underscore'); const core = require('@actions/core'); -const ActionUtils = require('../../libs/ActionUtils'); -const GithubUtils = require('../../libs/GithubUtils'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); // Parse the stringified JSON array of PR numbers, and cast each from String -> Number const PRList = _.map(ActionUtils.getJSONInput('PR_LIST', {required: true}), Number); diff --git a/.github/actions/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js similarity index 99% rename from .github/actions/getReleaseBody/index.js rename to .github/actions/javascript/getReleaseBody/index.js index 36fe167d6db3..e69746d179bc 100644 --- a/.github/actions/getReleaseBody/index.js +++ b/.github/actions/javascript/getReleaseBody/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 547: +/***/ 8201: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12134,6 +12134,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(547); +/******/ return __nccwpck_require__(8201); /******/ })() ; diff --git a/.github/actions/isPullRequestMergeable/action.yml b/.github/actions/javascript/isPullRequestMergeable/action.yml similarity index 100% rename from .github/actions/isPullRequestMergeable/action.yml rename to .github/actions/javascript/isPullRequestMergeable/action.yml diff --git a/.github/actions/isPullRequestMergeable/index.js b/.github/actions/javascript/isPullRequestMergeable/index.js similarity index 99% rename from .github/actions/isPullRequestMergeable/index.js rename to .github/actions/javascript/isPullRequestMergeable/index.js index e2f64dad56e8..50e39cbb847d 100644 --- a/.github/actions/isPullRequestMergeable/index.js +++ b/.github/actions/javascript/isPullRequestMergeable/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 8056: +/***/ 598: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12184,6 +12184,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(8056); +/******/ return __nccwpck_require__(598); /******/ })() ; diff --git a/.github/actions/isPullRequestMergeable/isPullRequestMergeable.js b/.github/actions/javascript/isPullRequestMergeable/isPullRequestMergeable.js similarity index 94% rename from .github/actions/isPullRequestMergeable/isPullRequestMergeable.js rename to .github/actions/javascript/isPullRequestMergeable/isPullRequestMergeable.js index 12cca54fc06f..409e177f12cb 100644 --- a/.github/actions/isPullRequestMergeable/isPullRequestMergeable.js +++ b/.github/actions/javascript/isPullRequestMergeable/isPullRequestMergeable.js @@ -1,7 +1,7 @@ const _ = require('underscore'); const core = require('@actions/core'); -const GithubUtils = require('../../libs/GithubUtils'); -const {promiseWhile} = require('../../libs/promiseWhile'); +const GithubUtils = require('../../../libs/GithubUtils'); +const {promiseWhile} = require('../../../libs/promiseWhile'); const MAX_RETRIES = 30; const THROTTLE_DURATION = process.env.NODE_ENV === 'test' ? 5 : 5000; diff --git a/.github/actions/isStagingDeployLocked/action.yml b/.github/actions/javascript/isStagingDeployLocked/action.yml similarity index 100% rename from .github/actions/isStagingDeployLocked/action.yml rename to .github/actions/javascript/isStagingDeployLocked/action.yml diff --git a/.github/actions/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js similarity index 99% rename from .github/actions/isStagingDeployLocked/index.js rename to .github/actions/javascript/isStagingDeployLocked/index.js index 940f9b10d467..4e6a8ba62535 100644 --- a/.github/actions/isStagingDeployLocked/index.js +++ b/.github/actions/javascript/isStagingDeployLocked/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 608: +/***/ 8441: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12098,6 +12098,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(608); +/******/ return __nccwpck_require__(8441); /******/ })() ; diff --git a/.github/actions/isStagingDeployLocked/isStagingDeployLocked.js b/.github/actions/javascript/isStagingDeployLocked/isStagingDeployLocked.js similarity index 92% rename from .github/actions/isStagingDeployLocked/isStagingDeployLocked.js rename to .github/actions/javascript/isStagingDeployLocked/isStagingDeployLocked.js index d130dae85c97..61714274a307 100644 --- a/.github/actions/isStagingDeployLocked/isStagingDeployLocked.js +++ b/.github/actions/javascript/isStagingDeployLocked/isStagingDeployLocked.js @@ -1,6 +1,6 @@ const _ = require('underscore'); const core = require('@actions/core'); -const GithubUtils = require('../../libs/GithubUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); const run = function () { return GithubUtils.getStagingDeployCash() diff --git a/.github/actions/markPullRequestsAsDeployed/action.yml b/.github/actions/javascript/markPullRequestsAsDeployed/action.yml similarity index 100% rename from .github/actions/markPullRequestsAsDeployed/action.yml rename to .github/actions/javascript/markPullRequestsAsDeployed/action.yml diff --git a/.github/actions/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js similarity index 99% rename from .github/actions/markPullRequestsAsDeployed/index.js rename to .github/actions/javascript/markPullRequestsAsDeployed/index.js index 3ff1d08baa33..85d5a9495748 100644 --- a/.github/actions/markPullRequestsAsDeployed/index.js +++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 519: +/***/ 2759: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12310,6 +12310,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(519); +/******/ return __nccwpck_require__(2759); /******/ })() ; diff --git a/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js similarity index 98% rename from .github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js rename to .github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js index 6fa3e8c3a6df..e0aeefa579ce 100644 --- a/.github/actions/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js +++ b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.js @@ -2,8 +2,8 @@ const _ = require('underscore'); const lodashGet = require('lodash/get'); const core = require('@actions/core'); const {context} = require('@actions/github'); -const ActionUtils = require('../../libs/ActionUtils'); -const GithubUtils = require('../../libs/GithubUtils'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); const prList = ActionUtils.getJSONInput('PR_LIST', {required: true}); const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true}); diff --git a/.github/actions/reopenIssueWithComment/action.yml b/.github/actions/javascript/reopenIssueWithComment/action.yml similarity index 100% rename from .github/actions/reopenIssueWithComment/action.yml rename to .github/actions/javascript/reopenIssueWithComment/action.yml diff --git a/.github/actions/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js similarity index 99% rename from .github/actions/reopenIssueWithComment/index.js rename to .github/actions/javascript/reopenIssueWithComment/index.js index 19b5f9d4367c..98793c8e1e65 100644 --- a/.github/actions/reopenIssueWithComment/index.js +++ b/.github/actions/javascript/reopenIssueWithComment/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 888: +/***/ 8634: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const core = __nccwpck_require__(2186); @@ -12109,6 +12109,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(888); +/******/ return __nccwpck_require__(8634); /******/ })() ; diff --git a/.github/actions/reopenIssueWithComment/reopenIssueWithComment.js b/.github/actions/javascript/reopenIssueWithComment/reopenIssueWithComment.js similarity index 95% rename from .github/actions/reopenIssueWithComment/reopenIssueWithComment.js rename to .github/actions/javascript/reopenIssueWithComment/reopenIssueWithComment.js index 29dd1674706c..08c8a2619655 100644 --- a/.github/actions/reopenIssueWithComment/reopenIssueWithComment.js +++ b/.github/actions/javascript/reopenIssueWithComment/reopenIssueWithComment.js @@ -1,5 +1,5 @@ const core = require('@actions/core'); -const GithubUtils = require('../../libs/GithubUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); const issueNumber = core.getInput('ISSUE_NUMBER', {required: true}); const comment = core.getInput('COMMENT', {required: true}); diff --git a/.github/actions/triggerWorkflowAndWait/action.yml b/.github/actions/javascript/triggerWorkflowAndWait/action.yml similarity index 100% rename from .github/actions/triggerWorkflowAndWait/action.yml rename to .github/actions/javascript/triggerWorkflowAndWait/action.yml diff --git a/.github/actions/triggerWorkflowAndWait/index.js b/.github/actions/javascript/triggerWorkflowAndWait/index.js similarity index 99% rename from .github/actions/triggerWorkflowAndWait/index.js rename to .github/actions/javascript/triggerWorkflowAndWait/index.js index c65145d0e52d..d0b91a87baa9 100644 --- a/.github/actions/triggerWorkflowAndWait/index.js +++ b/.github/actions/javascript/triggerWorkflowAndWait/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 9908: +/***/ 9822: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12327,6 +12327,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(9908); +/******/ return __nccwpck_require__(9822); /******/ })() ; diff --git a/.github/actions/triggerWorkflowAndWait/triggerWorkflowAndWait.js b/.github/actions/javascript/triggerWorkflowAndWait/triggerWorkflowAndWait.js similarity index 97% rename from .github/actions/triggerWorkflowAndWait/triggerWorkflowAndWait.js rename to .github/actions/javascript/triggerWorkflowAndWait/triggerWorkflowAndWait.js index 8082b479985b..67d6689dfffb 100644 --- a/.github/actions/triggerWorkflowAndWait/triggerWorkflowAndWait.js +++ b/.github/actions/javascript/triggerWorkflowAndWait/triggerWorkflowAndWait.js @@ -1,8 +1,8 @@ const _ = require('underscore'); const core = require('@actions/core'); -const ActionUtils = require('../../libs/ActionUtils'); -const GithubUtils = require('../../libs/GithubUtils'); -const {promiseWhile} = require('../../libs/promiseWhile'); +const ActionUtils = require('../../../libs/ActionUtils'); +const GithubUtils = require('../../../libs/GithubUtils'); +const {promiseWhile} = require('../../../libs/promiseWhile'); /** * The maximum amount of time (in ms) we'll wait for a new workflow to start after sending the workflow_dispatch event. diff --git a/.github/actions/verifySignedCommits/action.yml b/.github/actions/javascript/verifySignedCommits/action.yml similarity index 100% rename from .github/actions/verifySignedCommits/action.yml rename to .github/actions/javascript/verifySignedCommits/action.yml diff --git a/.github/actions/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js similarity index 99% rename from .github/actions/verifySignedCommits/index.js rename to .github/actions/javascript/verifySignedCommits/index.js index 9e7dc78fa717..48ad52700165 100644 --- a/.github/actions/verifySignedCommits/index.js +++ b/.github/actions/javascript/verifySignedCommits/index.js @@ -5,7 +5,7 @@ module.exports = /******/ (() => { // webpackBootstrap /******/ var __webpack_modules__ = ({ -/***/ 7115: +/***/ 5740: /***/ ((__unused_webpack_module, __unused_webpack_exports, __nccwpck_require__) => { const _ = __nccwpck_require__(3571); @@ -12141,6 +12141,6 @@ module.exports = require("zlib");; /******/ // module exports must be returned from runtime so entry inlining is disabled /******/ // startup /******/ // Load entry module and return exports -/******/ return __nccwpck_require__(7115); +/******/ return __nccwpck_require__(5740); /******/ })() ; diff --git a/.github/actions/verifySignedCommits/verifySignedCommits.js b/.github/actions/javascript/verifySignedCommits/verifySignedCommits.js similarity index 93% rename from .github/actions/verifySignedCommits/verifySignedCommits.js rename to .github/actions/javascript/verifySignedCommits/verifySignedCommits.js index c994d08893c4..bbd65fdffe1f 100644 --- a/.github/actions/verifySignedCommits/verifySignedCommits.js +++ b/.github/actions/javascript/verifySignedCommits/verifySignedCommits.js @@ -1,7 +1,7 @@ const _ = require('underscore'); const core = require('@actions/core'); const github = require('@actions/github'); -const GitHubUtils = require('../../libs/GithubUtils'); +const GitHubUtils = require('../../../libs/GithubUtils'); const PR_NUMBER = Number.parseInt(core.getInput('PR_NUMBER'), 10) || github.context.payload.pull_request.number; diff --git a/.github/scripts/buildActions.sh b/.github/scripts/buildActions.sh index 4c47e9f95956..812e93f3588d 100755 --- a/.github/scripts/buildActions.sh +++ b/.github/scripts/buildActions.sh @@ -5,7 +5,7 @@ # In order for this script to be safely run from anywhere, we cannot use the raw relative path '../actions' declare ACTIONS_DIR -ACTIONS_DIR="$(dirname "$(dirname "$0")")/actions" +ACTIONS_DIR="$(dirname "$(dirname "$0")")/actions/javascript" # List of paths to all JS files that implement our GH Actions declare -r GITHUB_ACTIONS=( diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 3a8477b607de..fc63d53267d4 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -107,7 +107,7 @@ In order to bundle actions with their dependencies into a single Node.js executa - Use the absolute path of the action in GitHub, including the repo name, path, and branch ref, like so: ```yaml - name: Generate Version - uses: Expensify/App/.github/actions/bumpVersion@main + uses: Expensify/App/.github/actions/javascript/bumpVersion@main ``` Do not try to use a relative path. - Confusingly, paths in action metadata files (`action.yml`) _must_ use relative paths. @@ -120,7 +120,7 @@ We have a unique way of defining certain workflows which can be manually trigger ```yaml - name: Create new BUILD version - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: createNewVersion.yml diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml index 51d7eae346a3..d7d02b127513 100644 --- a/.github/workflows/cherryPick.yml +++ b/.github/workflows/cherryPick.yml @@ -44,7 +44,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create new BUILD version - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: createNewVersion.yml @@ -91,7 +91,7 @@ jobs: - name: Get merge commit for CP pull request id: getCPMergeCommit - uses: Expensify/App/.github/actions/getPullRequestDetails@main + uses: Expensify/App/.github/actions/javascript/getPullRequestDetails@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USER: ${{ github.actor }} @@ -111,7 +111,7 @@ jobs: - name: Get merge commit for version-bump pull request id: getVersionBumpMergeCommit - uses: Expensify/App/.github/actions/getPullRequestDetails@main + uses: Expensify/App/.github/actions/javascript/getPullRequestDetails@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} USER: OSBotify @@ -155,7 +155,7 @@ jobs: - name: Check if ShortVersionString is up to date id: isShortVersionStringUpdated - uses: Expensify/App/.github/actions/checkBundleVersionStringMatch@main + uses: Expensify/App/.github/actions/javascript/checkBundleVersionStringMatch@main - name: Auto-assign PR if there are merge conflicts or if the bundle versions are mismatched if: ${{ !fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) || !fromJSON(steps.isShortVersionStringUpdated.outputs.BUNDLE_VERSIONS_MATCH) }} @@ -198,7 +198,7 @@ jobs: - name: Check if pull request is mergeable id: isPullRequestMergeable - uses: Expensify/App/.github/actions/isPullRequestMergeable@main + uses: Expensify/App/.github/actions/javascript/isPullRequestMergeable@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.pr_number }} diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 5e442002ea4e..73cc2c10b7b4 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -50,7 +50,7 @@ jobs: - name: Generate version id: bumpVersion - uses: Expensify/App/.github/actions/bumpVersion@main + uses: Expensify/App/.github/actions/javascript/bumpVersion@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} SEMVER_LEVEL: ${{ github.event.inputs.SEMVER_LEVEL }} @@ -67,7 +67,7 @@ jobs: git push origin ${{ env.VERSION_BRANCH }} - name: Update main branch - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: updateProtectedBranch.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 61ddc4d059e6..b7e31d403de8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -91,7 +91,7 @@ jobs: - name: Get Release Pull Request List id: getReleasePRList - uses: Expensify/App/.github/actions/getDeployPullRequestList@main + uses: Expensify/App/.github/actions/javascript/getDeployPullRequestList@main with: TAG: ${{ env.PRODUCTION_VERSION }} GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -99,7 +99,7 @@ jobs: - name: Generate Release Body id: getReleaseBody - uses: Expensify/App/.github/actions/getReleaseBody@main + uses: Expensify/App/.github/actions/javascript/getReleaseBody@main with: PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }} diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml index 015ed9a98007..af2f68319dce 100644 --- a/.github/workflows/deployBlocker.yml +++ b/.github/workflows/deployBlocker.yml @@ -26,7 +26,7 @@ jobs: echo "DEPLOY_BLOCKER_TITLE=$(sed -e "s/'/'\\\\''/g; s/\`/\\\\\`/g; 1s/^/'/; \$s/\$/'/" <<< "$TITLE")";} >> "$GITHUB_ENV" - name: Update StagingDeployCash with new deploy blocker - uses: Expensify/App/.github/actions/createOrUpdateStagingDeploy@main + uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml index 8553f9b63fbb..999e9198245e 100644 --- a/.github/workflows/finishReleaseCycle.yml +++ b/.github/workflows/finishReleaseCycle.yml @@ -24,7 +24,7 @@ jobs: - name: Reopen and comment on issue if: ${{ !fromJSON(steps.validateActor.outputs.isTeamMember) }} - uses: Expensify/App/.github/actions/reopenIssueWithComment@main + uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} @@ -35,14 +35,14 @@ jobs: - name: Check for any deploy blockers if: ${{ fromJSON(steps.validateActor.outputs.isTeamMember) }} id: checkDeployBlockers - uses: Expensify/App/.github/actions/checkDeployBlockers@main + uses: Expensify/App/.github/actions/javascript/checkDeployBlockers@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} - name: Reopen and comment on issue if: ${{ fromJSON(steps.validateActor.outputs.isTeamMember) && fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS) }} - uses: Expensify/App/.github/actions/reopenIssueWithComment@main + uses: Expensify/App/.github/actions/javascript/reopenIssueWithComment@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} ISSUE_NUMBER: ${{ github.event.issue.number }} @@ -62,7 +62,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Update production branch - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: updateProtectedBranch.yml @@ -88,14 +88,14 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create new PATCH version - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: createNewVersion.yml INPUTS: '{ "SEMVER_LEVEL": "PATCH" }' - name: Update staging branch to trigger staging deploy - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: updateProtectedBranch.yml @@ -116,7 +116,7 @@ jobs: run: git tag ${{ env.NEW_VERSION }} - name: Create new StagingDeployCash - uses: Expensify/App/.github/actions/createOrUpdateStagingDeploy@main + uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} NPM_VERSION: ${{ env.NEW_VERSION }} diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index f1b8d44d97fe..c862307fe958 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -17,7 +17,7 @@ jobs: token: ${{ secrets.OS_BOTIFY_TOKEN }} - name: Wait for staging deploys to finish - uses: Expensify/App/.github/actions/awaitStagingDeploys@main + uses: Expensify/App/.github/actions/javascript/awaitStagingDeploys@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 28a453427c05..5dde0740209a 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -454,14 +454,14 @@ jobs: - name: Get Release Pull Request List id: getReleasePRList - uses: Expensify/App/.github/actions/getDeployPullRequestList@main + uses: Expensify/App/.github/actions/javascript/getDeployPullRequestList@main with: TAG: ${{ env.VERSION }} GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} IS_PRODUCTION_DEPLOY: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} - name: Comment on issues - uses: Expensify/App/.github/actions/markPullRequestsAsDeployed@main + uses: Expensify/App/.github/actions/javascript/markPullRequestsAsDeployed@main with: PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }} IS_PRODUCTION_DEPLOY: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index 791b02d86233..edb217781c3c 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -65,7 +65,7 @@ jobs: - name: Check if StagingDeployCash is locked id: isStagingDeployLocked - uses: Expensify/App/.github/actions/isStagingDeployLocked@main + uses: Expensify/App/.github/actions/javascript/isStagingDeployLocked@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} @@ -110,7 +110,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create new BUILD version - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: createNewVersion.yml @@ -124,7 +124,7 @@ jobs: - name: Update staging branch from main if: ${{ !fromJSON(needs.chooseDeployActions.outputs.isStagingDeployLocked) }} - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: updateProtectedBranch.yml @@ -135,7 +135,7 @@ jobs: - name: Cherry pick to staging if: ${{ fromJSON(env.DO_CHERRY_PICK) }} - uses: Expensify/App/.github/actions/triggerWorkflowAndWait@main + uses: Expensify/App/.github/actions/javascript/triggerWorkflowAndWait@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} WORKFLOW: cherryPick.yml @@ -152,7 +152,7 @@ jobs: git tag ${{ env.NEW_VERSION }} - name: Update StagingDeployCash - uses: Expensify/App/.github/actions/createOrUpdateStagingDeploy@main + uses: Expensify/App/.github/actions/javascript/createOrUpdateStagingDeploy@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} NPM_VERSION: ${{ env.NEW_VERSION }} @@ -170,7 +170,7 @@ jobs: - name: Wait for staging deploys to finish if: ${{ fromJSON(env.DO_CHERRY_PICK) }} - uses: Expensify/App/.github/actions/awaitStagingDeploys@main + uses: Expensify/App/.github/actions/javascript/awaitStagingDeploys@main with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} TAG: ${{ env.NEW_VERSION }} diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index b03689245b6f..ff5d65a9079d 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -111,7 +111,7 @@ jobs: - name: Check if pull request is mergeable id: isPullRequestMergeable - uses: Expensify/App/.github/actions/isPullRequestMergeable@main + uses: Expensify/App/.github/actions/javascript/isPullRequestMergeable@main with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PULL_REQUEST_NUMBER: ${{ steps.createPullRequest.outputs.PR_NUMBER }} diff --git a/.github/workflows/verifySignedCommits.yml b/.github/workflows/verifySignedCommits.yml index 771898b777d0..4213de927ceb 100644 --- a/.github/workflows/verifySignedCommits.yml +++ b/.github/workflows/verifySignedCommits.yml @@ -9,6 +9,6 @@ jobs: verifySignedCommits: runs-on: ubuntu-latest steps: - - uses: Expensify/App/.github/actions/verifySignedCommits@17da0f886c04fcc92d9773a983da9f041dcbf483 + - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@17da0f886c04fcc92d9773a983da9f041dcbf483 with: GITHUB_TOKEN: ${{ github.token }} From aafdf2fa2749c224581bb1318fded9466b5fb92f Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Tue, 28 Jun 2022 15:28:16 -0700 Subject: [PATCH 2/4] Use composite action for failed workflows --- .../announceFailedWorkflowInSlack/action.yml | 22 ++++++++++ .github/workflows/createNewVersion.yml | 22 +--------- .github/workflows/deployBlocker.yml | 22 +--------- .github/workflows/finishReleaseCycle.yml | 22 +--------- .github/workflows/lockDeploys.yml | 22 +--------- .github/workflows/platformDeploy.yml | 18 +------- .github/workflows/preDeploy.yml | 44 ++----------------- .github/workflows/updateProtectedBranch.yml | 22 +--------- .github/workflows/warnCPLabel.yml | 22 +--------- 9 files changed, 39 insertions(+), 177 deletions(-) create mode 100644 .github/actions/composite/announceFailedWorkflowInSlack/action.yml diff --git a/.github/actions/composite/announceFailedWorkflowInSlack/action.yml b/.github/actions/composite/announceFailedWorkflowInSlack/action.yml new file mode 100644 index 000000000000..6a21642ad1ff --- /dev/null +++ b/.github/actions/composite/announceFailedWorkflowInSlack/action.yml @@ -0,0 +1,22 @@ +name: 'Announce failed workflow in Slack' +description: 'Post failed workflow in Slack #announce channel' +runs: + using: composite + steps: + - uses: 8398a7/action-slack@v3 + name: Job failed Slack notification + with: + status: custom + fields: workflow, repo + custom_payload: | + { + channel: '#announce', + attachments: [{ + color: "#DB4545", + pretext: ``, + text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, + }] + } + env: + GITHUB_TOKEN: ${{ github.token }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml index 73cc2c10b7b4..3c6d0f7374e0 100644 --- a/.github/workflows/createNewVersion.yml +++ b/.github/workflows/createNewVersion.yml @@ -73,23 +73,5 @@ jobs: WORKFLOW: updateProtectedBranch.yml INPUTS: '{ "TARGET_BRANCH": "main", "SOURCE_BRANCH": "${{ env.VERSION_BRANCH }}" }' - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml index af2f68319dce..d21fe9809f23 100644 --- a/.github/workflows/deployBlocker.yml +++ b/.github/workflows/deployBlocker.yml @@ -64,23 +64,5 @@ jobs: 2. Find someone who can quickly fix the issue. 3. Fix the issue yourself. - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml index 999e9198245e..f6ddc198f518 100644 --- a/.github/workflows/finishReleaseCycle.yml +++ b/.github/workflows/finishReleaseCycle.yml @@ -121,23 +121,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} NPM_VERSION: ${{ env.NEW_VERSION }} - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml index c862307fe958..b182c1a734e0 100644 --- a/.github/workflows/lockDeploys.yml +++ b/.github/workflows/lockDeploys.yml @@ -29,23 +29,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 5dde0740209a..1bf682557149 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -356,23 +356,7 @@ jobs: if: ${{ failure() }} needs: [android, desktop, iOS, web] steps: - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main postSlackMessageOnSuccess: name: Post a Slack message when all platforms deploy successfully diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index edb217781c3c..a3c852ea6f0a 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -17,26 +17,8 @@ jobs: if: ${{ always() }} steps: - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ needs.lint.result == 'failure' || needs.test.result == 'failure' }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ needs.lint.result == 'failure' || needs.test.result == 'failure' }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main - if: ${{ needs.lint.result == 'failure' || needs.test.result == 'failure' }} run: exit 1 @@ -184,26 +166,8 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main # Check if actor is member of Expensify organization by looking for Expensify/expensify team isExpensifyEmployee: diff --git a/.github/workflows/updateProtectedBranch.yml b/.github/workflows/updateProtectedBranch.yml index ff5d65a9079d..4be1b286cbb4 100644 --- a/.github/workflows/updateProtectedBranch.yml +++ b/.github/workflows/updateProtectedBranch.yml @@ -134,23 +134,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main diff --git a/.github/workflows/warnCPLabel.yml b/.github/workflows/warnCPLabel.yml index fe3d034c7d13..bad9fd6677f6 100644 --- a/.github/workflows/warnCPLabel.yml +++ b/.github/workflows/warnCPLabel.yml @@ -19,23 +19,5 @@ jobs: :warning: :warning: **Heads up! This pull request has the `CP Staging` label.** :warning: :warning: Merging it will cause it to be immediately deployed to staging, _even if the [open `StagingDeployCash` deploy checklist](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3AStagingDeployCash) is locked._ - # This Slack step is duplicated in all workflows, if you make a change to this step, make sure to update all - # the other workflows with the same change - - uses: 8398a7/action-slack@v3 - name: Job failed Slack notification - if: ${{ failure() }} - with: - status: custom - fields: workflow, repo - custom_payload: | - { - channel: '#announce', - attachments: [{ - color: "#DB4545", - pretext: ``, - text: `💥 ${process.env.AS_REPO} failed on ${process.env.AS_WORKFLOW} workflow 💥`, - }] - } - env: - GITHUB_TOKEN: ${{ github.token }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + - if: ${{ failure() }} + uses: Expensify/App/.github/actions/composite/announceFailedWorkflowInSlack@main From 4d20bc048708dd5beb93a40ebe5db191b35b1e87 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Tue, 28 Jun 2022 15:36:14 -0700 Subject: [PATCH 3/4] Use main for our own actions --- .github/workflows/verifySignedCommits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verifySignedCommits.yml b/.github/workflows/verifySignedCommits.yml index 4213de927ceb..e1068e71e041 100644 --- a/.github/workflows/verifySignedCommits.yml +++ b/.github/workflows/verifySignedCommits.yml @@ -9,6 +9,6 @@ jobs: verifySignedCommits: runs-on: ubuntu-latest steps: - - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@17da0f886c04fcc92d9773a983da9f041dcbf483 + - uses: Expensify/App/.github/actions/javascript/verifySignedCommits@main with: GITHUB_TOKEN: ${{ github.token }} From 643e9106a319d7fb921bc9d30c99b15e13240fdb Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Tue, 28 Jun 2022 15:41:36 -0700 Subject: [PATCH 4/4] Fix imports in tests --- tests/unit/awaitStagingDeploysTest.js | 2 +- tests/unit/checkDeployBlockersTest.js | 2 +- tests/unit/createOrUpdateStagingDeployTest.js | 2 +- tests/unit/isPullRequestMergeableTest.js | 2 +- tests/unit/isStagingDeployLockedTest.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/awaitStagingDeploysTest.js b/tests/unit/awaitStagingDeploysTest.js index 8b4536ee7b05..08c05a1fd11a 100644 --- a/tests/unit/awaitStagingDeploysTest.js +++ b/tests/unit/awaitStagingDeploysTest.js @@ -3,7 +3,7 @@ */ const core = require('@actions/core'); const _ = require('underscore'); -const run = require('../../.github/actions/awaitStagingDeploys/awaitStagingDeploys'); +const run = require('../../.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys'); const GitHubUtils = require('../../.github/libs/GithubUtils'); // Lower poll rate to speed up tests diff --git a/tests/unit/checkDeployBlockersTest.js b/tests/unit/checkDeployBlockersTest.js index 983c94f2aac7..83a83cdfc685 100644 --- a/tests/unit/checkDeployBlockersTest.js +++ b/tests/unit/checkDeployBlockersTest.js @@ -4,7 +4,7 @@ const _ = require('underscore'); const core = require('@actions/core'); const GithubUtils = require('../../.github/libs/GithubUtils'); -const run = require('../../.github/actions/checkDeployBlockers/checkDeployBlockers'); +const run = require('../../.github/actions/javascript/checkDeployBlockers/checkDeployBlockers'); // Static mock function for core.getInput const mockGetInput = jest.fn().mockImplementation((arg) => { diff --git a/tests/unit/createOrUpdateStagingDeployTest.js b/tests/unit/createOrUpdateStagingDeployTest.js index 3d9d5400e525..bd4c063d1496 100644 --- a/tests/unit/createOrUpdateStagingDeployTest.js +++ b/tests/unit/createOrUpdateStagingDeployTest.js @@ -5,7 +5,7 @@ const core = require('@actions/core'); const moment = require('moment'); const GitUtils = require('../../.github/libs/GitUtils'); const GithubUtils = require('../../.github/libs/GithubUtils'); -const run = require('../../.github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy'); +const run = require('../../.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy'); const mockGetInput = jest.fn(); const mockListIssues = jest.fn(); diff --git a/tests/unit/isPullRequestMergeableTest.js b/tests/unit/isPullRequestMergeableTest.js index 2897b2589560..567b877e8c75 100644 --- a/tests/unit/isPullRequestMergeableTest.js +++ b/tests/unit/isPullRequestMergeableTest.js @@ -1,7 +1,7 @@ const core = require('@actions/core'); const GithubUtils = require('../../.github/libs/GithubUtils'); -const run = require('../../.github/actions/isPullRequestMergeable/isPullRequestMergeable'); +const run = require('../../.github/actions/javascript/isPullRequestMergeable/isPullRequestMergeable'); // Static mock function for core.getInput const mockGetInput = jest.fn().mockImplementation((arg) => { diff --git a/tests/unit/isStagingDeployLockedTest.js b/tests/unit/isStagingDeployLockedTest.js index 1442dde5bdd6..b5e47e34c09b 100644 --- a/tests/unit/isStagingDeployLockedTest.js +++ b/tests/unit/isStagingDeployLockedTest.js @@ -1,5 +1,5 @@ const core = require('@actions/core'); -const run = require('../../.github/actions/isStagingDeployLocked/isStagingDeployLocked'); +const run = require('../../.github/actions/javascript/isStagingDeployLocked/isStagingDeployLocked'); const GithubUtils = require('../../.github/libs/GithubUtils'); // Mock the entire GitHubUtils module