resolve conflict

Author: nkdengineer

.github/ISSUE_TEMPLATE/ExpertContributorChangeRequest.md renamed to .github/ISSUE_TEMPLATE/OnboardOffboardExpertContributor.md

@@ -1,32 +1,37 @@
 ---
-name: Add or remove expert contributor from the team
-about: In order to get access to the HybridApp setup, expert contributors need to be added to our Github Organization. They also need to be added to the necessary rooms in Slack
+name: Onboard or offboard an expert contributor from the team
+about: In order to get access to the HybridApp setup, expert contributors need to be added to our GitHub Organization. They also need to be added to the necessary rooms in Slack
 title: "Expert Contributor Change Request - <insert-name>"
-labels: Daily, Task, ring0
+labels: Daily, Task, Access Change
 ---
 
+### Requester Tasks
+
+- [ ] Provide the Expert Contributor Details requested below
+- [ ] Add / remove from the following Slack channels via Slack Connect
+    - [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
+    - [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
+    - [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
+    - [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
+    - [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
+    - [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)
+    - [ ] [#expert-contributors](https://expensify.enterprise.slack.com/archives/C08CZDJFJ77)
+
 ### Expert Contributor Details
 
-- Name: 
-- Github handle (or Github profile link):
+- Full Name: 
+- GitHub handle:
 - Email:
 - Slack post in your team channel with this request for visibility: 
 - Team (check your team):
     - [ ] Callstack
     - [ ] Margelo
     - [ ] Software Mansion
 
-Do you want to remove this developer from the team? YES/NO
+Which action do you wish to take for this team member (select one):
+- [ ] Onboard - add them to the team
+- [ ] Offboard - remove them from the team
 
-### Tasks for ring0 assignee
+### Ring0 Tasks
 
-- [ ] Add to the appropriate GitHub child team of [external-expert-contributors](https://github.com/orgs/Expensify/teams/external-expert-contributors/teams) (each agency must have its own child team)
-- [ ] Add to Slack channels using Slack Connect: 
-    - [ ] [#quality](https://expensify.enterprise.slack.com/archives/C05LX9D6E07)
-    - [ ] [#convert](https://expensify.enterprise.slack.com/archives/C07HPDRELLD)
-    - [ ] [#retain](https://expensify.enterprise.slack.com/archives/C07NZ8B1VTQ)
-    - [ ] [#migrate](https://expensify.enterprise.slack.com/archives/C07NMDKEFMH)
-    - [ ] [#expense](https://expensify.enterprise.slack.com/archives/C06ML6X0W9L)
-    - [ ] [#expensify-bugs](https://expensify.enterprise.slack.com/archives/C049HHMV9SM)
-    - [ ] [#expensify-open-source](https://expensify.enterprise.slack.com/archives/C01GTK53T8Q)
-    - [ ] [#expert-contributors](https://expensify.enterprise.slack.com/archives/C08CZDJFJ77)
+- [ ] Add to / remove from the appropriate GitHub child team of [external-expert-contributors](https://github.com/orgs/Expensify/teams/external-expert-contributors/teams) (each agency must have its own child team)

.github/actions/javascript/authorChecklist/index.js

@@ -4730,79 +4730,6 @@ exports.throttling = throttling;
 //# sourceMappingURL=index.js.map
 
 
-/***/ }),
-
-/***/ 537:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var deprecation = __nccwpck_require__(8932);
-var once = _interopDefault(__nccwpck_require__(1223));
-
-const logOnceCode = once(deprecation => console.warn(deprecation));
-const logOnceHeaders = once(deprecation => console.warn(deprecation));
-/**
- * Error with extra properties to help with debugging
- */
-class RequestError extends Error {
-  constructor(message, statusCode, options) {
-    super(message);
-    // Maintains proper stack trace (only available on V8)
-    /* istanbul ignore next */
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-    this.name = "HttpError";
-    this.status = statusCode;
-    let headers;
-    if ("headers" in options && typeof options.headers !== "undefined") {
-      headers = options.headers;
-    }
-    if ("response" in options) {
-      this.response = options.response;
-      headers = options.response.headers;
-    }
-    // redact request credentials without mutating original request options
-    const requestCopy = Object.assign({}, options.request);
-    if (options.request.headers.authorization) {
-      requestCopy.headers = Object.assign({}, options.request.headers, {
-        authorization: options.request.headers.authorization.replace(/ .*$/, " [REDACTED]")
-      });
-    }
-    requestCopy.url = requestCopy.url
-    // client_id & client_secret can be passed as URL query parameters to increase rate limit
-    // see https://developer.github.com/v3/#increasing-the-unauthenticated-rate-limit-for-oauth-applications
-    .replace(/\bclient_secret=\w+/g, "client_secret=[REDACTED]")
-    // OAuth tokens can be passed as URL query parameters, although it is not recommended
-    // see https://developer.github.com/v3/#oauth2-token-sent-in-a-header
-    .replace(/\baccess_token=\w+/g, "access_token=[REDACTED]");
-    this.request = requestCopy;
-    // deprecations
-    Object.defineProperty(this, "code", {
-      get() {
-        logOnceCode(new deprecation.Deprecation("[@octokit/request-error] `error.code` is deprecated, use `error.status`."));
-        return statusCode;
-      }
-    });
-    Object.defineProperty(this, "headers", {
-      get() {
-        logOnceHeaders(new deprecation.Deprecation("[@octokit/request-error] `error.headers` is deprecated, use `error.response.headers`."));
-        return headers || {};
-      }
-    });
-  }
-}
-
-exports.RequestError = RequestError;
-//# sourceMappingURL=index.js.map
-
-
 /***/ }),
 
 /***/ 3682:
@@ -12402,7 +12329,6 @@ const core = __importStar(__nccwpck_require__(2186));
 const utils_1 = __nccwpck_require__(3030);
 const plugin_paginate_rest_1 = __nccwpck_require__(4193);
 const plugin_throttling_1 = __nccwpck_require__(9968);
-const request_error_1 = __nccwpck_require__(537);
 const EmptyObject_1 = __nccwpck_require__(8227);
 const arrayDifference_1 = __importDefault(__nccwpck_require__(7034));
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
@@ -12825,34 +12751,6 @@ class GithubUtils {
         })
             .then((response) => response.url);
     }
-    /**
-     * Get commits between two tags via the GitHub API
-     */
-    static async getCommitHistoryBetweenTags(fromTag, toTag) {
-        console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
-        try {
-            const { data: comparison } = await this.octokit.repos.compareCommits({
-                owner: CONST_1.default.GITHUB_OWNER,
-                repo: CONST_1.default.APP_REPO,
-                base: fromTag,
-                head: toTag,
-            });
-            // Map API response to our CommitType format
-            return comparison.commits.map((commit) => ({
-                commit: commit.sha,
-                subject: commit.commit.message,
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                authorName: commit.commit.author?.name || 'Unknown',
-            }));
-        }
-        catch (error) {
-            if (error instanceof request_error_1.RequestError && error.status === 404) {
-                console.error(`❓❓ Failed to compare commits with the GitHub API. The base tag ('${fromTag}') or head tag ('${toTag}') likely doesn't exist on the remote repository. If this is the case, create or push them. 💡💡`);
-            }
-            // Re-throw the error after logging
-            throw error;
-        }
-    }
 }
 exports["default"] = GithubUtils;
 

.github/actions/javascript/awaitStagingDeploys/index.js

@@ -13,6 +13,8 @@ inputs:
 outputs:
     HALTED:
         description: True if the app is halted, false otherwise
+    COMPLETED:
+        description: True if the app is completed a rollout, false otherwise
     ROLLOUT_PERCENTAGE:
         description: The calculated rollout percentage
 runs:

.github/actions/javascript/checkAndroidStatus/action.yml

@@ -6,8 +6,9 @@ import GithubUtils from '@github/libs/GithubUtils';
 const PACKAGE_NAME = core.getInput('PACKAGE_NAME', {required: true});
 const GOOGLE_KEY_FILE = core.getInput('GOOGLE_KEY_FILE', {required: true});
 const HALTED_STATUS = 'halted';
+const COMPLETED_STATUS = 'completed';
 
-async function checkAndroidStatus() {
+async function checkAndroidStatus(): Promise<string> {
     const auth = new google.auth.GoogleAuth({
         keyFile: GOOGLE_KEY_FILE,
         scopes: ['https://www.googleapis.com/auth/androidpublisher'],
@@ -38,9 +39,15 @@ async function checkAndroidStatus() {
         // Check if the status is halted
         const HALTED = status === HALTED_STATUS;
         core.setOutput('HALTED', HALTED);
+
+        // Check if the status is completed
+        const COMPLETED = status === COMPLETED_STATUS;
+        core.setOutput('COMPLETED', COMPLETED);
+
+        return status;
     } catch (error) {
         console.error('Error checking track status:', error);
-        process.exit(1);
+        throw error;
     }
 }
 

.github/actions/javascript/checkAndroidStatus/checkAndroidStatus.ts

@@ -4730,79 +4730,6 @@ exports.throttling = throttling;
 //# sourceMappingURL=index.js.map
 
 
-/***/ }),
-
-/***/ 10537:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var deprecation = __nccwpck_require__(58932);
-var once = _interopDefault(__nccwpck_require__(1223));
-
-const logOnceCode = once(deprecation => console.warn(deprecation));
-const logOnceHeaders = once(deprecation => console.warn(deprecation));
-/**
- * Error with extra properties to help with debugging
- */
-class RequestError extends Error {
-  constructor(message, statusCode, options) {
-    super(message);
-    // Maintains proper stack trace (only available on V8)
-    /* istanbul ignore next */
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-    this.name = "HttpError";
-    this.status = statusCode;
-    let headers;
-    if ("headers" in options && typeof options.headers !== "undefined") {
-      headers = options.headers;
-    }
-    if ("response" in options) {
-      this.response = options.response;
-      headers = options.response.headers;
-    }
-    // redact request credentials without mutating original request options
-    const requestCopy = Object.assign({}, options.request);
-    if (options.request.headers.authorization) {
-      requestCopy.headers = Object.assign({}, options.request.headers, {
-        authorization: options.request.headers.authorization.replace(/ .*$/, " [REDACTED]")
-      });
-    }
-    requestCopy.url = requestCopy.url
-    // client_id & client_secret can be passed as URL query parameters to increase rate limit
-    // see https://developer.github.com/v3/#increasing-the-unauthenticated-rate-limit-for-oauth-applications
-    .replace(/\bclient_secret=\w+/g, "client_secret=[REDACTED]")
-    // OAuth tokens can be passed as URL query parameters, although it is not recommended
-    // see https://developer.github.com/v3/#oauth2-token-sent-in-a-header
-    .replace(/\baccess_token=\w+/g, "access_token=[REDACTED]");
-    this.request = requestCopy;
-    // deprecations
-    Object.defineProperty(this, "code", {
-      get() {
-        logOnceCode(new deprecation.Deprecation("[@octokit/request-error] `error.code` is deprecated, use `error.status`."));
-        return statusCode;
-      }
-    });
-    Object.defineProperty(this, "headers", {
-      get() {
-        logOnceHeaders(new deprecation.Deprecation("[@octokit/request-error] `error.headers` is deprecated, use `error.response.headers`."));
-        return headers || {};
-      }
-    });
-  }
-}
-
-exports.RequestError = RequestError;
-//# sourceMappingURL=index.js.map
-
-
 /***/ }),
 
 /***/ 26463:
@@ -736922,6 +736849,7 @@ const GithubUtils_1 = __importDefault(__nccwpck_require__(19296));
 const PACKAGE_NAME = core.getInput('PACKAGE_NAME', { required: true });
 const GOOGLE_KEY_FILE = core.getInput('GOOGLE_KEY_FILE', { required: true });
 const HALTED_STATUS = 'halted';
+const COMPLETED_STATUS = 'completed';
 async function checkAndroidStatus() {
     const auth = new googleapis_1.google.auth.GoogleAuth({
         keyFile: GOOGLE_KEY_FILE,
@@ -736948,10 +736876,14 @@ async function checkAndroidStatus() {
         // Check if the status is halted
         const HALTED = status === HALTED_STATUS;
         core.setOutput('HALTED', HALTED);
+        // Check if the status is completed
+        const COMPLETED = status === COMPLETED_STATUS;
+        core.setOutput('COMPLETED', COMPLETED);
+        return status;
     }
     catch (error) {
         console.error('Error checking track status:', error);
-        process.exit(1);
+        throw error;
     }
 }
 async function getLatestReleaseDate() {
@@ -737097,7 +737029,6 @@ const core = __importStar(__nccwpck_require__(42186));
 const utils_1 = __nccwpck_require__(73030);
 const plugin_paginate_rest_1 = __nccwpck_require__(64193);
 const plugin_throttling_1 = __nccwpck_require__(9968);
-const request_error_1 = __nccwpck_require__(10537);
 const EmptyObject_1 = __nccwpck_require__(58227);
 const arrayDifference_1 = __importDefault(__nccwpck_require__(97034));
 const CONST_1 = __importDefault(__nccwpck_require__(29873));
@@ -737520,34 +737451,6 @@ class GithubUtils {
         })
             .then((response) => response.url);
     }
-    /**
-     * Get commits between two tags via the GitHub API
-     */
-    static async getCommitHistoryBetweenTags(fromTag, toTag) {
-        console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
-        try {
-            const { data: comparison } = await this.octokit.repos.compareCommits({
-                owner: CONST_1.default.GITHUB_OWNER,
-                repo: CONST_1.default.APP_REPO,
-                base: fromTag,
-                head: toTag,
-            });
-            // Map API response to our CommitType format
-            return comparison.commits.map((commit) => ({
-                commit: commit.sha,
-                subject: commit.commit.message,
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                authorName: commit.commit.author?.name || 'Unknown',
-            }));
-        }
-        catch (error) {
-            if (error instanceof request_error_1.RequestError && error.status === 404) {
-                console.error(`❓❓ Failed to compare commits with the GitHub API. The base tag ('${fromTag}') or head tag ('${toTag}') likely doesn't exist on the remote repository. If this is the case, create or push them. 💡💡`);
-            }
-            // Re-throw the error after logging
-            throw error;
-        }
-    }
 }
 exports["default"] = GithubUtils;