Skip to content

Commit

Permalink
fixing merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ramykl committed Dec 27, 2023
1 parent b8ff826 commit 29b8e8a
Showing 1 changed file with 7 additions and 72 deletions.
79 changes: 7 additions & 72 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,39 +151,6 @@ jobs:
cache-version: yarn-berry-v1
app-dir: "~/project/sample"
- run: cd ~/project/sample && yarn test
check-test-results-uploaded:
executor:
name: node/default
steps:
- jq/install
- run:
name: fetch workflow
command: |
curl --request GET \
--url https://circleci.com/api/v2/workflow/$CIRCLE_WORKFLOW_ID/job \
--header 'authorization: Basic $CIRCLE_TOKEN' > workflow.json
- check-uploaded-test-results:
job-name: node-npm-jest-test-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-yarn-jest-test-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-pnpm-jest-test-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-test-results-file-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-npm-mocha-test-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-yarn-mocha-test-job
expected-tests: 1
- check-uploaded-test-results:
job-name: node-pnpm-mocha-test-job
expected-tests: 1


workflows:
test-deploy:
Expand Down Expand Up @@ -217,18 +184,13 @@ workflows:
test-results-for: jest
pkg-manager: yarn
- node/test:
filters:
tags:
only: /.*/
filters: *filters
name: node-pnpm-jest-test-job
app-dir: "~/project/sample"
cache-version: v4
test-results-for: jest
pkg-manager: pnpm
- node/test:
filters:
tags:
only: /.*/
filters: *filters
name: node-npm-mocha-test-job
app-dir: "~/project/sample"
Expand All @@ -244,20 +206,15 @@ workflows:
pkg-manager: yarn
run-command: testmocha
- node/test:
filters:
tags:
only: /.*/
filters: *filters
name: node-pnpm-mocha-test-job
app-dir: "~/project/sample"
cache-version: v4
test-results-for: mocha
pkg-manager: pnpm
run-command: testmocha
- node/test:
filters:
tags:
only: /.*/
filters: *filters
filters: *filters
name: node-yarn-mocha-with-test-result-path-job
app-dir: "~/project/sample"
cache-version: v4
Expand All @@ -276,18 +233,6 @@ workflows:
name: node-test-no-junit
app-dir: "~/project/sample"
cache-version: v4
- check-test-results-uploaded:
filters:
tags:
only: /.*/
requires:
- node-npm-jest-test-job
- node-yarn-jest-test-job
- node-pnpm-jest-test-job
- node-npm-mocha-test-job
- node-yarn-mocha-test-job
- node-pnpm-mocha-test-job
- node-test-results-file-job
- node/run:
filters: *filters
name: node-run-npm-job
Expand All @@ -302,27 +247,18 @@ workflows:
pkg-manager: yarn
yarn-run: build
- node/run:
filters:
tags:
only: /.*/
filters: *filters
name: node-run-pnpm-job
app-dir: "~/project/sample"
cache-version: v5
pkg-manager: pnpm
yarn-run: build
- integration-test-override-ci:
filters:
tags:
only: /.*/
filters: *filters
- integration-test-override-ci-windows:
filters:
tags:
only: /.*/
filters: *filters
- integration-test-pnpm:
filters:
tags:
only: /.*/
filters: *filters
filters: *filters
- integration-test-override-ci-windows:
filters: *filters
- integration-test-yarn:
Expand All @@ -341,7 +277,6 @@ workflows:
- integration-test-install-latest
- integration-test-install-lts
- integration-test-pnpm
- check-test-results-uploaded
- node-yarn-mocha-with-test-result-path-job
- node-test-results-file-job
- node-run-npm-job
Expand Down

0 comments on commit 29b8e8a

Please sign in to comment.