Skip to content

Commit cca16e3

Browse files
authored
chore: clean up repo (#77)
* simplify tests, update readme and package-lock format * simplify all steps * more clean up * remove unused script * remove ok-file * derp * herp-derp * remove more stuff * remove codeship and appVeyor from the readme
1 parent cf35ab3 commit cca16e3

7 files changed

+25
-393
lines changed

Diff for: README.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
55
Build status | Name | Description
66
:--- | :--- | :---
7-
[![CircleCI](https://circleci.com/gh/cypress-io/cypress-test-tiny.svg?style=svg)](https://circleci.com/gh/cypress-io/cypress-test-tiny) | CircleCI | Linux & Mac & Win 64
8-
[![Build status](https://ci.appveyor.com/api/projects/status/er7wpte7j00fsm8d/branch/master?svg=true)](https://ci.appveyor.com/project/cypress-io/cypress-test-tiny-fitqm/branch/master) | AppVeyor | Windows 32-bit
9-
[![Build status](https://ci.appveyor.com/api/projects/status/bpwo4jpue61xsbi5/branch/master?svg=true)](https://ci.appveyor.com/project/cypress-io/cypress-test-tiny/branch/master) | AppVeyor | Windows 64-bit
10-
[ ![Codeship Status for cypress-io/cypress-test-tiny](https://app.codeship.com/projects/98843020-d6d6-0135-402d-5207bc7a4d86/status?branch=master)](https://app.codeship.com/projects/263289) | Codeship Basic | Linux Docker
7+
[![CircleCI](https://dl.circleci.com/status-badge/img/gh/cypress-io/cypress-test-tiny/tree/master.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/cypress-io/cypress-test-tiny/tree/master) | CircleCI | Linux & Mac & Win 64
118

129
## Important
1310

Diff for: appveyor-win32-x64.yml

-43
This file was deleted.

Diff for: circle.yml

+16-131
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@ executors:
1212
macos:
1313
xcode: "13.0.0"
1414

15-
commands:
16-
early-stop:
17-
description: |
18-
Early halt if this commit is for testing binaries for different platform
19-
Place this command AFTER checkout command because we need to look
20-
at the commit subject text
21-
parameters:
22-
substring:
23-
type: string
24-
description: String to search for in the commit subject to skip build
25-
steps:
26-
- run:
27-
name: Checking OS platform for "<< parameters.substring >>"
28-
command: node ./early-stop "<< parameters.substring >>" || circleci step halt
2915
jobs:
3016
mac-test:
3117
executor: mac
@@ -34,98 +20,28 @@ jobs:
3420

3521
steps:
3622
- checkout
37-
- early-stop:
38-
substring: Testing new win32
39-
- early-stop:
40-
substring: Testing new linux
41-
42-
# Download and cache dependencies for the app and for tests
43-
- restore_cache:
44-
keys:
45-
- v{{ .Environment.CACHE_VERSION }}-dependencies-v2-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
46-
# fallback to using the latest cache if no exact match is found
47-
- v{{ .Environment.CACHE_VERSION }}-dependencies-v2-{{ arch }}-{{ .Branch }}-
48-
4923
- run: npm ci
50-
- run: npm install @cypress/commit-message-install
51-
- run: $(npm bin)/commit-message-install --else "npm install cypress"
52-
- run: npx cypress cache path
53-
54-
- save_cache:
55-
paths:
56-
# local NPM modules
57-
- node_modules
58-
# all NPM modules
59-
- ~/.npm
60-
# Cypress binary (or yarn dependencies) on Linux
61-
- ~/Library/Caches/Cypress
62-
key: v{{ .Environment.CACHE_VERSION }}-dependencies-v2-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
63-
64-
- run: $(npm bin)/commit-message-install --else "npm install cypress"
65-
- run: $(npm bin)/run-if npm run cypress:info
66-
- run: $(npm bin)/run-if npm run cypress:version
67-
- run: $(npm bin)/run-if npm run cypress:run
68-
- run: $(npm bin)/run-if npm run check-videos
69-
- run: $(npm bin)/run-if npm run cypress:cache:list
70-
71-
- run:
72-
when: on_success
73-
name: Set status check
74-
command: $(npm bin)/set-status --state success --description "on CircleCI"
75-
- run:
76-
when: on_fail
77-
name: Set status check
78-
command: $(npm bin)/set-status --state failure --description "on CircleCI"
24+
- run: npm install cypress
25+
- run: npm run cypress:info
26+
- run: npm run cypress:version
27+
- run: npm run cypress:run
28+
- run: npm run cypress:cache:list
7929

8030
linux-test:
8131
docker:
8232
# find Docker image at https://github.com/cypress-io/cypress-docker-images
83-
- image: cypress/base:16.14.2-slim
33+
- image: cypress/base:16.18.1
8434

8535
working_directory: ~/repo
8636

8737
steps:
8838
- checkout
89-
- early-stop:
90-
substring: Testing new win32
91-
- early-stop:
92-
substring: Testing new darwin
93-
94-
# Download and cache dependencies for the app and for tests
95-
- restore_cache:
96-
keys:
97-
- v{{ .Environment.CACHE_VERSION }}-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
98-
# fallback to using the latest cache if no exact match is found
99-
- v{{ .Environment.CACHE_VERSION }}-dependencies-{{ arch }}-{{ .Branch }}-
100-
10139
- run: npm ci
102-
103-
- save_cache:
104-
paths:
105-
# local NPM modules
106-
- node_modules
107-
# all NPM modules
108-
- ~/.npm
109-
# Cypress binary (or yarn dependencies) on Linux
110-
- ~/.cache
111-
key: v{{ .Environment.CACHE_VERSION }}-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
112-
113-
- run: npm install @cypress/commit-message-install
114-
- run: $(npm bin)/commit-message-install --else "npm install cypress"
115-
- run: $(npm bin)/run-if npm run cypress:version
116-
- run: $(npm bin)/run-if npm run cypress:run
117-
- run: $(npm bin)/run-if npm run check-videos
118-
- run: $(npm bin)/run-if npm run cypress:info
119-
- run: $(npm bin)/run-if npm run cypress:cache:list
120-
121-
- run:
122-
when: on_success
123-
name: Set status check
124-
command: $(npm bin)/set-status --state success --description "on CircleCI"
125-
- run:
126-
when: on_fail
127-
name: Set status check
128-
command: $(npm bin)/set-status --state failure --description "on CircleCI"
40+
- run: npm install cypress
41+
- run: npm run cypress:info
42+
- run: npm run cypress:version
43+
- run: npm run cypress:run
44+
- run: npm run cypress:cache:list
12945

13046
win-test:
13147
working_directory: ~/app
@@ -134,43 +50,12 @@ jobs:
13450
shell: bash.exe
13551
steps:
13652
- checkout
137-
- early-stop:
138-
substring: Testing new linux
139-
- early-stop:
140-
substring: Testing new darwin
141-
142-
- restore_cache:
143-
key: v{{ .Environment.CACHE_VERSION }}-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
144-
14553
- run: npm ci
146-
147-
- save_cache:
148-
key: v{{ .Environment.CACHE_VERSION }}-dependencies-{{ arch }}-{{ .Branch }}-{{ checksum "package.json" }}
149-
paths:
150-
# could not use environment variables for some reason
151-
- C:\Users\circleci\AppData\Local\Cypress\Cache
152-
- C:\Users\circleci\AppData\Roaming\npm-cache
153-
154-
- run: npm install @cypress/commit-message-install
155-
- run: $(npm bin)/commit-message-install --else "npm install cypress"
156-
- run: $(npm bin)/run-if npm run cypress:version
157-
- run: $(npm bin)/run-if npm run cypress:run
158-
- run: $(npm bin)/run-if npm run cypress:info
159-
- run: $(npm bin)/run-if npm run cypress:cache:list
160-
- run:
161-
name: check videos
162-
command: $(npm bin)/run-if npm run check-videos
163-
environment:
164-
DEBUG: ok-file
165-
166-
- run:
167-
when: on_success
168-
name: Set status check
169-
command: $(npm bin)/set-status --state success --description "on CircleCI"
170-
- run:
171-
when: on_fail
172-
name: Set status check
173-
command: $(npm bin)/set-status --state failure --description "on CircleCI"
54+
- run: npm install cypress
55+
- run: npm run cypress:info
56+
- run: npm run cypress:version
57+
- run: npm run cypress:run
58+
- run: npm run cypress:cache:list
17459

17560
workflows:
17661
version: 2

Diff for: early-stop.js

-30
This file was deleted.

0 commit comments

Comments
 (0)