Skip to content

Commit

Permalink
fix review
Browse files Browse the repository at this point in the history
  • Loading branch information
@tgriesser
tgriesser committed Nov 19, 2021
1 parent 96c3c14 commit ce8cdc4
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
12 changes: 1 addition & 11 deletions circle.yml
View file
Expand Up @@ -9,7 +9,6 @@ macBuildFilters: &macBuildFilters
only:
- develop
- tgriesser/build/root-yarn-install
- 9.0-release

defaults: &defaults
parallelism: 1
Expand Down Expand Up @@ -43,7 +42,6 @@ onlyMainBranches: &onlyMainBranches
branches:
only:
- develop
- 9.0-release
requires:
- create-build-artifacts

Expand Down Expand Up @@ -1514,7 +1512,7 @@ jobs:
- run:
name: Check current branch to persist artifacts
command: |
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "9.0-release" ]]; then
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tgriesser/build/root-yarn-install" ]]; then
echo "Not uploading artifacts or posting install comment for this branch."
circleci-agent step halt
fi
Expand Down Expand Up @@ -2156,7 +2154,6 @@ linux-workflow: &linux-workflow
branches:
only:
- develop
- 9.0-release
requires:
- build
- test-kitchensink:
Expand All @@ -2168,7 +2165,6 @@ linux-workflow: &linux-workflow
branches:
only:
- develop
- 9.0-release
requires:
- build
- create-build-artifacts:
Expand Down Expand Up @@ -2218,15 +2214,13 @@ linux-workflow: &linux-workflow
branches:
only:
- develop
- 9.0-release
requires:
- create-build-artifacts
- test-npm-module-and-verify-binary:
filters:
branches:
only:
- develop
- 9.0-release
requires:
- create-build-artifacts
- test-binary-against-staging:
Expand All @@ -2235,7 +2229,6 @@ linux-workflow: &linux-workflow
branches:
only:
- develop
- 9.0-release
requires:
- create-build-artifacts

Expand All @@ -2260,7 +2253,6 @@ linux-workflow: &linux-workflow
branches:
only:
- develop
- 9.0-release
requires:
- create-build-artifacts

Expand Down Expand Up @@ -2332,7 +2324,6 @@ mac-workflow: &mac-workflow
branches:
only:
- develop
- 9.0-release
requires:
- darwin-create-build-artifacts

Expand All @@ -2344,7 +2335,6 @@ mac-workflow: &mac-workflow
branches:
only:
- develop
- 9.0-release
requires:
- darwin-create-build-artifacts

Expand Down
1 change: 1 addition & 0 deletions cli/package.json
View file
Expand Up @@ -71,6 +71,7 @@
"@types/chai": "4.2.15",
"@types/chai-jquery": "1.1.40",
"@types/jquery": "3.3.31",
"@types/lodash": "4.14.168",
"@types/minimatch": "3.0.3",
"@types/mocha": "8.0.3",
"@types/sinon": "7.5.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/launcher/lib/darwin/util.ts
View file
Expand Up @@ -115,7 +115,7 @@ export async function darwinDetectionWorkaround (): Promise<FoundBrowser[]> {
let args = ['./detection-workaround.js']

if (process.env.CYPRESS_INTERNAL_ENV === 'development') {
args = ['-r', '@packages/ts/register.js'].concat(['./detection-workaround.ts'])
args = ['-r', '@packages/ts/register.js', './detection-workaround.ts']
}

const { stdout } = await utils.execa(nodePath, args, { cwd: __dirname })
Expand Down
2 changes: 1 addition & 1 deletion yarn.lock
View file
Expand Up @@ -8019,7 +8019,7 @@
resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.0.tgz#c0ca4c253664492dbf47a646f31cfd483a6bbc95"
integrity sha512-x9OaQQTb1N2hPZ/LWJsqushexDvz7NgzuZxiRmZio44WPuolTZNHDBCrOxCzRVOMwamJRO2dWax5NbygOf1OTQ==

"@types/lodash@^4.14.168":
"@types/lodash@4.14.168", "@types/lodash@^4.14.168":
version "4.14.168"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
Expand Down

3 comments on commit ce8cdc4

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ce8cdc4 Nov 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/9.0.1/circle-tgriesser/build/root-yarn-install-ce8cdc47a902c1b60c8ddd11de49a7d89566f3e1/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ce8cdc4 Nov 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AppVeyor has built the win32 x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/9.0.1/appveyor-tgriesser/build/root-yarn-install-ce8cdc47a902c1b60c8ddd11de49a7d89566f3e1/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on ce8cdc4 Nov 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/9.0.1/circle-tgriesser/build/root-yarn-install-ce8cdc47a902c1b60c8ddd11de49a7d89566f3e1/cypress.tgz

Please sign in to comment.