From 5b158875cfd4fe11101d7a407a966268fef86ca1 Mon Sep 17 00:00:00 2001 From: Justin Dalrymple Date: Wed, 1 Dec 2021 17:34:45 -0500 Subject: [PATCH 1/3] Fixing ci script --- .circleci/config.yml | 54 +++++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e6803eab..38f17272 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,15 +146,15 @@ jobs: keys: - yarn-{{ checksum "yarn.lock" }} - run: yarn build - - save_cache: - name: Cache build files - key: build-{{ checksum "yarn.lock" }} - paths: - - packages/core/dist/ - - packages/cli/dist/ - - packages/browser/dist/ - - packages/node/dist/ - - packages/requester-utils/dist/ + - persist_to_workspace: + root: /tmp/workspace + paths: + - packages/core/dist/ + - packages/cli/dist/ + - packages/browser/dist/ + - packages/node/dist/ + - packages/requester-utils/dist/ + - store_artifacts: path: packages/core/dist/ - store_artifacts: @@ -301,10 +301,8 @@ jobs: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} + - attach_workspace: + at: /tmp/workspace - run: yarn workspace @gitbeaker/core test:integration test-integration-browser: @@ -314,14 +312,12 @@ jobs: PLAYWRIGHT_BROWSERS_PATH: 0 steps: - checkout + - attach_workspace: + at: /tmp/workspace - restore_cache: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} - restore_cache: name: Restore env vars keys: @@ -336,14 +332,12 @@ jobs: - image: node:lts-alpine steps: - checkout + - attach_workspace: + at: /tmp/workspace - restore_cache: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} - restore_cache: name: Restore env vars keys: @@ -358,14 +352,12 @@ jobs: - image: node:lts-alpine steps: - checkout + - attach_workspace: + at: /tmp/workspace - restore_cache: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} - restore_cache: name: Restore env vars keys: @@ -406,14 +398,12 @@ jobs: - image: node:lts-alpine steps: - checkout + - attach_workspace: + at: /tmp/workspace - restore_cache: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} - run: | NUM_RELEASES=$(find packages -maxdepth 2 -name '*dist*' -type d -print | wc -l) @@ -444,14 +434,12 @@ jobs: - image: node:lts-alpine steps: - checkout + - attach_workspace: + at: /tmp/workspace - restore_cache: name: Restore yarn package cache keys: - yarn-{{ checksum "yarn.lock" }} - - restore_cache: - name: Restore build cache - keys: - - build-{{ checksum "yarn.lock" }} - run: | NUM_RELEASES=$(find packages -maxdepth 2 -name '*dist*' -type d -print | wc -l) From da20147fc0972690d99ca80c8bb48b00a8285dd4 Mon Sep 17 00:00:00 2001 From: Justin Dalrymple Date: Wed, 1 Dec 2021 17:39:41 -0500 Subject: [PATCH 2/3] Indenting the workspace config --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38f17272..024982d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,13 +147,13 @@ jobs: - yarn-{{ checksum "yarn.lock" }} - run: yarn build - persist_to_workspace: - root: /tmp/workspace - paths: - - packages/core/dist/ - - packages/cli/dist/ - - packages/browser/dist/ - - packages/node/dist/ - - packages/requester-utils/dist/ + root: /tmp/workspace + paths: + - packages/core/dist/ + - packages/cli/dist/ + - packages/browser/dist/ + - packages/node/dist/ + - packages/requester-utils/dist/ - store_artifacts: path: packages/core/dist/ From f3ce7655ed8f374e20de5c8cc699b6d7ec5c97b8 Mon Sep 17 00:00:00 2001 From: Justin Dalrymple Date: Wed, 1 Dec 2021 17:51:08 -0500 Subject: [PATCH 3/3] Fixing root --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 024982d0..d0f7fd18 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,7 +147,7 @@ jobs: - yarn-{{ checksum "yarn.lock" }} - run: yarn build - persist_to_workspace: - root: /tmp/workspace + root: . paths: - packages/core/dist/ - packages/cli/dist/ @@ -302,7 +302,7 @@ jobs: keys: - yarn-{{ checksum "yarn.lock" }} - attach_workspace: - at: /tmp/workspace + at: . - run: yarn workspace @gitbeaker/core test:integration test-integration-browser: @@ -313,7 +313,7 @@ jobs: steps: - checkout - attach_workspace: - at: /tmp/workspace + at: . - restore_cache: name: Restore yarn package cache keys: @@ -333,7 +333,7 @@ jobs: steps: - checkout - attach_workspace: - at: /tmp/workspace + at: . - restore_cache: name: Restore yarn package cache keys: @@ -353,7 +353,7 @@ jobs: steps: - checkout - attach_workspace: - at: /tmp/workspace + at: . - restore_cache: name: Restore yarn package cache keys: @@ -399,7 +399,7 @@ jobs: steps: - checkout - attach_workspace: - at: /tmp/workspace + at: . - restore_cache: name: Restore yarn package cache keys: @@ -435,7 +435,7 @@ jobs: steps: - checkout - attach_workspace: - at: /tmp/workspace + at: . - restore_cache: name: Restore yarn package cache keys: