From 94bcfa2afc4f17fe91c19d330c7af9b6a75d1439 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 14:01:22 -0800 Subject: [PATCH 1/8] Increase CI allocation for beta builds. --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index db4f7353b..660d26931 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ jobs: app-beta-build: docker: - image: cimg/node:18.18.2 - resource_class: large + resource_class: xlarge working_directory: ~/repo/client steps: @@ -125,7 +125,7 @@ jobs: test-app-beta-build: docker: - image: cimg/node:18.18.2 - resource_class: large + resource_class: xlarge working_directory: ~/repo/client steps: From 000a2e471e520b25dcb3c4f66547c6773bc752fe Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 14:14:06 -0800 Subject: [PATCH 2/8] Use self hosted runner. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 660d26931..ad1d66418 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,7 @@ jobs: test-app-beta-build: docker: - image: cimg/node:18.18.2 - resource_class: xlarge + resource_class: snaptsoft/xps working_directory: ~/repo/client steps: From ff151444d252a5ef2ee93f2917dfeffc20dcb58c Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 14:44:38 -0800 Subject: [PATCH 3/8] Customer runner. --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ad1d66418..80bd28f8e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,8 @@ jobs: test-app-beta-build: docker: - image: cimg/node:18.18.2 - resource_class: snaptsoft/xps + machine: true + resource_class: snaptsoft/dell working_directory: ~/repo/client steps: From 7358dee3e0bafe43562e6f491d2f8584219640ce Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 17:17:10 -0800 Subject: [PATCH 4/8] CI adjustment. --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 80bd28f8e..4d0673465 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,6 @@ jobs: test-app-beta-build: docker: - image: cimg/node:18.18.2 - machine: true resource_class: snaptsoft/dell working_directory: ~/repo/client From c8979091fd4e7527dad23bc7b44ea2b6e84084d3 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 17:28:45 -0800 Subject: [PATCH 5/8] CI update. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d0673465..5b1458607 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -125,7 +125,7 @@ jobs: test-app-beta-build: docker: - image: cimg/node:18.18.2 - resource_class: snaptsoft/dell + resource_class: snaptsoft/pfic working_directory: ~/repo/client steps: From 3ca48350a6b1e32ed0a4a55a1fb3657d74224b5b Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 17:37:59 -0800 Subject: [PATCH 6/8] Update old orbs on CI --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b1458607..a01d00773 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,9 +2,9 @@ version: 2.1 orbs: #snyk: snyk/snyk@0.0.8 #cypress: cypress-io/cypress@1.23.0 - aws-s3: circleci/aws-s3@2.0.0 - eb: circleci/aws-elastic-beanstalk@1.0.2 - jira: circleci/jira@1.3.1 + aws-s3: circleci/aws-s3@4.0.0 + eb: circleci/aws-elastic-beanstalk@2.0.1 + jira: circleci/jira@2.1.0 jobs: api-deploy: docker: From 530032b5eaadfc2b59fa1a664af03b3d5697df08 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 30 Jan 2024 17:39:46 -0800 Subject: [PATCH 7/8] Remove Jira from CI. --- .circleci/config.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a01d00773..e00460768 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,6 @@ orbs: #cypress: cypress-io/cypress@1.23.0 aws-s3: circleci/aws-s3@4.0.0 eb: circleci/aws-elastic-beanstalk@2.0.1 - jira: circleci/jira@2.1.0 jobs: api-deploy: docker: @@ -18,7 +17,6 @@ jobs: eb status --verbose eb deploy eb status - - jira/notify hasura-migrate: docker: @@ -58,7 +56,6 @@ jobs: from: build to: "s3://imex-online-production/" arguments: "--exclude '*.map'" - - jira/notify app-beta-build: docker: @@ -79,7 +76,6 @@ jobs: from: build to: "s3://imex-online-beta/" arguments: "--exclude '*.map'" - - jira/notify test-hasura-migrate: docker: @@ -120,7 +116,6 @@ jobs: from: build to: "s3://imex-online-test/" arguments: "--exclude '*.map'" - - jira/notify test-app-beta-build: docker: @@ -142,7 +137,6 @@ jobs: from: build to: "s3://imex-online-test-beta/" arguments: "--exclude '*.map'" - - jira/notify admin-app-build: docker: From edc2a0f122d2c51fdaee08490a5ee804a6b416ea Mon Sep 17 00:00:00 2001 From: Dave Richer Date: Wed, 31 Jan 2024 11:59:25 -0500 Subject: [PATCH 8/8] - replace require with import Signed-off-by: Dave Richer --- client/src/components/job-lifecycle/job-lifecycle.component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/job-lifecycle/job-lifecycle.component.jsx b/client/src/components/job-lifecycle/job-lifecycle.component.jsx index 9f5ac94fd..04c8f4357 100644 --- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx +++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx @@ -7,7 +7,7 @@ import {DateTimeFormatterFunction} from "../../utils/DateFormatter"; import {isEmpty} from "lodash"; import {useTranslation} from "react-i18next"; -require('./job-lifecycle.styles.scss'); +import './job-lifecycle.styles.scss'; // show text on bar if text can fit export function JobLifecycleComponent({job, statuses, ...rest}) {