Skip to content

Commit e20bf71

Browse files
Merge branch 'development' into feat/block
2 parents 53c3d55 + 7d45ada commit e20bf71

Some content is hidden

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

43 files changed

+739
-311
lines changed

.distignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ docker-compose.travis.yml
4040
.nvmrc
4141
.releaserc.yml
4242
docker-compose.ci.yml
43+
.wp-env.json
44+
artifacts

.github/workflows/build-dev-artifacts.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ jobs:
3737
- name: Create zip
3838
run: |
3939
npm ci
40-
npm run build
40+
npm run build
41+
CURRENT_VERSION=$(node -p -e "require('./package.json').version")
42+
COMMIT_HASH=$(git rev-parse --short HEAD)
43+
DEV_VERSION="${CURRENT_VERSION}-dev.${COMMIT_HASH}"
44+
npm run grunt version::${DEV_VERSION}
4145
npm run dist
4246
- name: Retrieve branch name
4347
id: retrieve-branch-name

.wp-env.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"core": null,
33
"plugins": [ "." ],
4+
"lifecycleScripts": {
5+
"afterStart": "wp-env run tests-cli wp option update feedzy_legacyv5 1"
6+
7+
},
48
"env": {
59
"tests": {
610
"config": {

bin/cli-setup.sh

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

bin/mysql/init-db.sql

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/run-e2e-tests-default.sh

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

bin/run-e2e-tests-gutenberg.sh

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

bin/wp-down.sh

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

bin/wp-init.sh

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

css/feedzy-rss-feed-import.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
.feedzy_page_feedzy-integration .feedzy-header{
6464
margin-bottom: 40px;
6565
}
66-
.feedzy-api-error,
66+
6767
.feedzy-error-critical {
6868
color: #ff0000;
6969
}

0 commit comments

Comments
 (0)