Skip to content

Commit

Permalink
Merge pull request #12 from mckayb/feature/primitive-types
Browse files Browse the repository at this point in the history
Feature/primitive types
  • Loading branch information
mckayb authored Oct 12, 2020
2 parents 20d3541 + 055df53 commit f602ecf
Show file tree
Hide file tree
Showing 11 changed files with 1,050 additions and 372 deletions.
34 changes: 17 additions & 17 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
version: 2
jobs:
"php-7.1":
"php-7.2":
docker:
- image: circleci/php:7.1-node-browsers
- image: circleci/php:7.2-node-browsers
working_directory: ~/circleci
steps:
- checkout
- restore_cache:
keys:
- php71-phantasy-composer-{{ checksum "composer.lock" }}
- php71-phantasy-composer-
- php72-phantasy-composer-{{ checksum "composer.lock" }}
- php72-phantasy-composer-
- run: composer install -n --prefer-dist
- save_cache:
key: php71-phantasy-composer-{{ checksum "composer.lock" }}
key: php72-phantasy-composer-{{ checksum "composer.lock" }}
paths:
- vendor
- run: mkdir -p build/logs
Expand All @@ -23,19 +23,19 @@ jobs:
name: Run Tests
command: composer test

"php-7.2":
"php-7.3":
docker:
- image: circleci/php:7.2-node-browsers
- image: circleci/php:7.3-node-browsers
working_directory: ~/circleci
steps:
- checkout
- restore_cache:
keys:
- php72-phantasy-composer-{{ checksum "composer.lock" }}
- php72-phantasy-composer-
- php73-phantasy-composer-{{ checksum "composer.lock" }}
- php73-phantasy-composer-
- run: composer install -n --prefer-dist
- save_cache:
key: php72-phantasy-composer-{{ checksum "composer.lock" }}
key: php73-phantasy-composer-{{ checksum "composer.lock" }}
paths:
- vendor
- run: mkdir -p build/logs
Expand All @@ -46,19 +46,19 @@ jobs:
name: Run Tests
command: composer test

"php-7.3":
"php-7.4":
docker:
- image: circleci/php:7.3-node-browsers
- image: circleci/php:7.4-node-browsers
working_directory: ~/circleci
steps:
- checkout
- restore_cache:
keys:
- php73-phantasy-composer-{{ checksum "composer.lock" }}
- php73-phantasy-composer-
- php74-phantasy-composer-{{ checksum "composer.lock" }}
- php74-phantasy-composer-
- run: composer install -n --prefer-dist
- save_cache:
key: php73-phantasy-composer-{{ checksum "composer.lock" }}
key: php74-phantasy-composer-{{ checksum "composer.lock" }}
paths:
- vendor
- run: mkdir -p build/logs
Expand All @@ -78,6 +78,6 @@ workflows:
version: 2
build:
jobs:
- "php-7.1"
- "php-7.2"
- "php-7.3"
- "php-7.3"
- "php-7.4"
37 changes: 0 additions & 37 deletions .github/workflows/php.yml

This file was deleted.

5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
],
"require": {
"php": ">=7.1.0"
"php": ">=7.2.0"
},
"require-dev": {
"phpunit/phpunit": "^7.5",
Expand Down Expand Up @@ -39,7 +39,8 @@
"src/DataTypes/State/State.php",
"src/DataTypes/Set/Set.php",
"src/DataTypes/Collection/Collection.php",
"src/DataTypes/IO/IO.php"
"src/DataTypes/IO/IO.php",
"src/DataTypes/Text/Text.php"
]
},
"scripts": {
Expand Down
Loading

0 comments on commit f602ecf

Please sign in to comment.