Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MNT Remove pattern-lib, bump frameworktest, resolve merge-conflict #1224

Merged
merged 1 commit into from
Jun 3, 2021
Merged

MNT Remove pattern-lib, bump frameworktest, resolve merge-conflict #1224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 1 addition & 34 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,13 @@ import:
env:
global:
- REQUIRE_RECIPE="4.8.x-dev"
- REQUIRE_FRAMEWORKTEST="0.4.0"
- REQUIRE_FRAMEWORKTEST="0.4.2"

# Using a manual jobs matrix in addition to jobs-fixed because there are:
# - two different behat suites
# - a manual release of storybook
jobs:
include:
- php: 7.1
env:
- DB=MYSQL
- REQUIRE_INSTALLER="$REQUIRE_RECIPE"
- NPM_TEST=1
Copy link
Contributor

Choose a reason for hiding this comment

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

Doesn't look like any of those builds are running the JS tests. This is pretty bad.

<<<<<<< HEAD
- RELEASE=1
- php: 7.3
env:
- DB=MYSQL
Expand All @@ -35,11 +28,6 @@ jobs:
- REQUIRE_GRAPHQL="^3@dev"
- BEHAT_SUITE="cms"
- php: 7.3
=======
# TODO: move pattern-lib creation to a new process e.g. new repository and use github-pages
# - RELEASE=1
- php: 7.2
>>>>>>> 1.7
env:
- DB=MYSQL
- REQUIRE_INSTALLER="$REQUIRE_RECIPE"
Expand All @@ -53,24 +41,3 @@ jobs:
- BEHAT_TEST=1
- REQUIRE_GRAPHQL="^4@dev"
- BEHAT_SUITE="cms"

before_script:
- export CORE_RELEASE=$TRAVIS_BRANCH
- if [ "$COMPOSER_INSTALL_ARG" != "--ignore-platform-reqs"]; then printf "\n" | pecl install imagick; fi

before_deploy:
# Use installer to fill in any possible dependencies
- composer require silverstripe/installer:$REQUIRE_RECIPE
# Do the build
- yarn static-pattern-lib

deploy:
- provider: pages
skip_cleanup: true
keep-history: false
github-token: $GITHUB_AUTO_PUBLISH_API_TOKEN
local-dir: storybook-static
on:
branch: 1
repo: silverstripe/silverstripe-admin
condition: -n $RELEASE