From 01cca36f7d46759f63ac1748ad17b033721caaaa Mon Sep 17 00:00:00 2001 From: Mohamed Khelif Date: Mon, 14 Aug 2023 17:11:51 -0400 Subject: [PATCH 1/3] Only upload to cypress if on a pr or a mainline commit --- .evergreen.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.evergreen.yml b/.evergreen.yml index b50126a0..0671774b 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -247,7 +247,12 @@ functions: shell: bash script: | ${PREPARE_SHELL} - yarn cy:run --record --key ${cypress_record_key} --reporter junit + # Only record to cypress cloud if this is a pr or a mainline commit. + if [[ "${requester}" == "github_pr" || "${requester}" == "commit" ]]; then + yarn cy:run --record --key "${cypress_record_key}" --reporter junit + else + yarn cy:run --reporter junit + fi yarn-eslint: command: shell.exec From b806616050fcaa5c6d4fe9e4367b5eaa539d2eb3 Mon Sep 17 00:00:00 2001 From: Mohamed Khelif Date: Tue, 15 Aug 2023 19:32:26 -0400 Subject: [PATCH 2/3] Support patch requester --- .evergreen.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen.yml b/.evergreen.yml index 0671774b..37b8832e 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -248,7 +248,7 @@ functions: script: | ${PREPARE_SHELL} # Only record to cypress cloud if this is a pr or a mainline commit. - if [[ "${requester}" == "github_pr" || "${requester}" == "commit" ]]; then + if [[ "${requester}" == "github_pr" || "${requester}" == "commit" || "$requester" == "patch" ]]; then yarn cy:run --record --key "${cypress_record_key}" --reporter junit else yarn cy:run --reporter junit From b59a8f82d4b1e0e85f752bc15cf33092b6cbfadf Mon Sep 17 00:00:00 2001 From: Mohamed Khelif Date: Thu, 17 Aug 2023 10:49:41 -0400 Subject: [PATCH 3/3] types --- src/gql/generated/types.ts | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts index 5d4ab343..9f89f893 100644 --- a/src/gql/generated/types.ts +++ b/src/gql/generated/types.ts @@ -179,6 +179,11 @@ export type ClientConfig = { latestRevision?: Maybe; }; +export enum CloneMethod { + LegacySsh = "LEGACY_SSH", + Oauth = "OAUTH", +} + export type CloudProviderConfig = { __typename?: "CloudProviderConfig"; aws?: Maybe; @@ -312,7 +317,7 @@ export type Distro = { arch: Scalars["String"]; authorizedKeysFile: Scalars["String"]; bootstrapSettings: BootstrapSettings; - cloneMethod: Scalars["String"]; + cloneMethod: CloneMethod; containerPool: Scalars["String"]; disableShallowClone: Scalars["Boolean"]; disabled: Scalars["Boolean"]; @@ -339,6 +344,28 @@ export type Distro = { workDir: Scalars["String"]; }; +export type DistroEvent = { + __typename?: "DistroEvent"; + after?: Maybe; + before?: Maybe; + data?: Maybe; + timestamp: Scalars["Time"]; + user: Scalars["String"]; +}; + +/** DistroEventsInput is the input to the distroEvents query. */ +export type DistroEventsInput = { + before?: InputMaybe; + distroId: Scalars["String"]; + limit?: InputMaybe; +}; + +export type DistroEventsPayload = { + __typename?: "DistroEventsPayload"; + count: Scalars["Int"]; + eventLogEntries: Array; +}; + export type DistroInfo = { __typename?: "DistroInfo"; bootstrapMethod?: Maybe; @@ -354,7 +381,7 @@ export type DistroInput = { arch: Scalars["String"]; authorizedKeysFile: Scalars["String"]; bootstrapSettings: BootstrapSettingsInput; - cloneMethod: Scalars["String"]; + cloneMethod: CloneMethod; containerPool: Scalars["String"]; disableShallowClone: Scalars["Boolean"]; disabled: Scalars["Boolean"]; @@ -1783,6 +1810,7 @@ export type Query = { clientConfig?: Maybe; commitQueue: CommitQueue; distro?: Maybe; + distroEvents: DistroEventsPayload; distroTaskQueue: Array; distros: Array>; githubProjectConflicts: GithubProjectConflicts; @@ -1840,6 +1868,10 @@ export type QueryDistroArgs = { distroId: Scalars["String"]; }; +export type QueryDistroEventsArgs = { + opts: DistroEventsInput; +}; + export type QueryDistroTaskQueueArgs = { distroId: Scalars["String"]; }; @@ -2101,6 +2133,7 @@ export type ResourceLimitsInput = { virtualMemoryKb: Scalars["Int"]; }; +/** SaveDistroInput is the input to the saveDistro mutation. */ export type SaveDistroInput = { distro: DistroInput; onSave: DistroOnSaveOperation;