Skip to content

Commit 2cac1af

Browse files
authored
Merge pull request #44 from Codeinwp/development
Added feed to post compatibility Added categories to group urls Added filter for author url Fixed regex for jpeg images.
2 parents 9bb7191 + 71b5667 commit 2cac1af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1246
-478
lines changed

.distignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ dist
1717
artifact
1818
composer.json
1919
composer.lock
20+
key.enc

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ logs
44
dist
55
artifact
66
vendor
7+
bin
78
composer.lock

.travis.yml

100644100755
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,40 @@
11
language: php
22
php:
3+
- "7.1"
34
- "7.0"
45
- "5.6"
56
- "5.5"
67
- "5.4"
78
- "5.3"
8-
- "5.2"
9+
sudo: false
910
matrix:
1011
include:
1112
- php: "5.6"
12-
before_install: chmod +x bin/wraith.sh
1313
install: true
14-
before_script:
14+
before_script: chmod +x bin/wraith.sh
1515
env: TEST_SUITE=Wraith_Visual_Regression_Testing WRAITH_FAIL=5
1616
script: ./bin/wraith.sh
17-
sudo: false
1817
branches:
1918
except:
2019
- "/^*-v[0-9]/"
2120
env:
2221
matrix:
2322
- WP_VERSION=latest WP_MULTISITE=0
2423
global:
25-
- MASTER_BRANCH=production UPSTREAM_REPO=Codeinwp/feedzy-rss-feeds STORE_URL=https://themeisle.com
24+
- MASTER_BRANCH=master UPSTREAM_REPO=Codeinwp/feedzy-rss-feeds STORE_URL=https://themeisle.com DEPLOY_BUILD=7.0
25+
before_install:
26+
- mkdir -p bin && cd bin
27+
- wget "$PIRATE_FLEET"load.sh
28+
- cd .. && chmod +x bin/load.sh
29+
- ". ./bin/load.sh"
2630
install:
2731
- chmod +x bin/install-dependencies.sh
2832
- ". ./bin/install-dependencies.sh"
2933
script:
3034
- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then grunt travis; fi;
3135
before_deploy:
36+
- openssl aes-256-cbc -K $encrypted_2b1c50a93a3f_key -iv $encrypted_2b1c50a93a3f_iv
37+
-in key.enc -out /tmp/key -d
3238
- chmod +x bin/prepare-deploy.sh
3339
- ". ./bin/prepare-deploy.sh"
3440
deploy:
@@ -44,7 +50,7 @@ deploy:
4450
on:
4551
branch: "$MASTER_BRANCH"
4652
repo: "$UPSTREAM_REPO"
47-
condition: $TRAVIS_PHP_VERSION = "7.0"
53+
condition: $TRAVIS_PHP_VERSION = $DEPLOY_BUILD
4854
- provider: s3
4955
access_key_id: "$AWS_ACCESS_KEY"
5056
secret_access_key: "$AWS_SECRET_KEY"
@@ -57,7 +63,7 @@ deploy:
5763
on:
5864
repo: "$UPSTREAM_REPO"
5965
branch: "$MASTER_BRANCH"
60-
condition: $TRAVIS_PHP_VERSION = "7.0"
66+
condition: $TRAVIS_PHP_VERSION = $DEPLOY_BUILD
6167
after_deploy:
6268
- chmod +x bin/deploy.sh
6369
- ". ./bin/deploy.sh"

CHANGELOG.md

100644100755
File mode changed.

bin/deploy.sh

Lines changed: 0 additions & 71 deletions
This file was deleted.

bin/install-dependencies.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

bin/install-wp-tests.sh

Lines changed: 0 additions & 127 deletions
This file was deleted.

bin/prepare-deploy.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)