Skip to content

Commit

Permalink
Merge branch 'develop' into fix-release-scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
emilyrohrbough authored Mar 4, 2022
2 parents 10a779e + 469dfe4 commit f14f625
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ macWorkflowFilters: &mac-workflow-filters
when:
or:
- equal: [ develop, << pipeline.git.branch >> ]
- equal: [ fix-next-version-in-test-repos, << pipeline.git.branch >> ]
- equal: [ faster-mac-builds, << pipeline.git.branch >> ]
- matches:
pattern: "-release$"
value: << pipeline.git.branch >>
Expand Down Expand Up @@ -81,6 +81,7 @@ executors:
macos:
# Executor should have Node >= required version
xcode: "13.0.0"
resource_class: macos.x86.medium.gen2
environment:
PLATFORM: mac

Expand Down Expand Up @@ -2301,12 +2302,13 @@ mac-workflow: &mac-workflow
- node_modules_install:
name: darwin-node-modules-install
executor: mac
resource_class: macos.x86.medium.gen2
only-cache-for-root-user: true

- build:
name: darwin-build
executor: mac
resource_class: medium
resource_class: macos.x86.medium.gen2
requires:
- darwin-node-modules-install

Expand All @@ -2325,7 +2327,7 @@ mac-workflow: &mac-workflow
- test-runner:upload
- test-runner:commit-status-checks
executor: mac
resource_class: medium
resource_class: macos.x86.medium.gen2
requires:
- darwin-build

Expand Down

1 comment on commit f14f625

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on f14f625 Mar 4, 2022

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.5.2/linux-x64/circle-fix-release-scripts-f14f625ceb802bb59739a4c7723a4d8362aef2d2/cypress.tgz

Please sign in to comment.