Skip to content

Commit

Permalink
Merge pull request #3556 from CalderaWP/develop
Browse files Browse the repository at this point in the history
1.9.0 Release
  • Loading branch information
New0 authored Jun 18, 2020
2 parents 68535d0 + 6ceebc4 commit 0697458
Show file tree
Hide file tree
Showing 103 changed files with 8,602 additions and 7,161 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ wp-content
cypress/screenshots
cypress/videos
build
vendor

wp-test-case

Expand All @@ -34,3 +35,5 @@ dist/caldera-hot-load/*
!dist/README.md
!dist/react.min.js
!dist/react-dom.min.js

clients/*/build
9 changes: 9 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ variables:

# Unit Test Stage

## PHP Unit Tests
PHP 7.4 Unit:
stage: Unit Tests
image: edbizarro/gitlab-ci-pipeline-php:7.4-alpine
script:
- if [ -d "vendor" ]; then rm -Rf vendor; fi
- composer install --prefer-dist --no-ansi --no-interaction --no-progress
- composer test:unit

## PHP Unit Tests
PHP 7.3 Unit:
stage: Unit Tests
Expand Down
1 change: 1 addition & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ module.exports = function (grunt) {
'admin',
'blocks',
'components',
'form-builder',
'functions',
'privacy',
'pro',
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ This is the old stuff, built with grunt.
* `yarn build:clients` - Build other JavaScript and CSS for production.
* `yarn start` - Start dev server for clients that are not blocks and run watcher.
* `yarn start:blocks` - Start dev server for blocks and run watcher.
* `yarn start:clients` - Start dev server for other clients and run watcher.
* `yarn test:once` - Run JavaScript unit tests once
* `yarn test:e2e` - Start Cypress e2e test runner.
* `yarn test:e2e:ci` - Trigger Cypress.io test record.
Expand Down
2 changes: 1 addition & 1 deletion assets/build/css/admin.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/build/css/caldera-forms-front.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/build/js/edit.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 0697458

Please sign in to comment.