Skip to content

Commit

Permalink
Merge branch 'master' into fix/text-box-not-resizing
Browse files Browse the repository at this point in the history
* master: (85 commits)
  Bump puppeteer from 3.0.1 to 3.0.2 (#1359)
  Bump @svgr/webpack from 5.3.1 to 5.4.0 (#1352)
  Bump jest-matcher-deep-close-to from 1.3.0 to 2.0.0 (#1351)
  Use relative paths for lint-staged (#1357)
  Allow php nightly tests to fail (#1356)
  Update list of Google Fonts (#1345)
  Bump commander from 5.0.0 to 5.1.0 (#1344)
  Updated Build and Continuous Integration Tooling (#1096)
  Bump use-debounce from 3.4.1 to 3.4.2 (#1334)
  Bump terser-webpack-plugin from 2.3.5 to 2.3.6 (#1338)
  Bump @testing-library/dom from 7.2.1 to 7.2.2 (#1336)
  removing unnecessary returns
  fixing unnecessary returns and removing unused mock in useStoryApi test per carlos feedback
  Bump css-loader from 3.5.2 to 3.5.3 (#1332)
  cleaning up unecessary values getting passed to useStoryApi
  moving story related actions to their own useStoryApi file in provider to clean up apiProvider file, doing the same for fonts.
  Add catch block to mocked requests
  Use auto-save for preview (#1247)
  Unskip tests (#1327)
  Revert "Update tests"
  ...
  • Loading branch information
obetomuniz committed Apr 28, 2020
2 parents 117100f + 323fd2c commit 880b46e
Show file tree
Hide file tree
Showing 125 changed files with 5,573 additions and 2,549 deletions.
3 changes: 2 additions & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,18 @@ tests
.stylelintrc
.svgo.yml
.travis.yml
.travis_deploy_key
.travis_deploy_key.enc
babel.config.js
codecov.yml
composer.json
composer.lock
CONTRIBUTING.md
jest-puppeteer.config.js
package.json
package-lock.json
phpcs.xml
phpstan.neon.dist
phpunit.xml.dist
puppeteer.config.js
README.md
webpack.config.js
11 changes: 8 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,9 @@
},
{
"files": [
"bin/**/*.js",
"babel.config.js",
"puppeteer.config.js",
"jest-puppeteer.config.js",
"webpack.config.js",
".storybook/*.js",
"tests/js/*.js",
Expand All @@ -229,13 +230,17 @@
}
},
{
"files": ["**/*.md"],
"files": [
"*.md",
"**/*.md"
],
"plugins": [
"markdown"
],
"rules": {
"no-undef": "off",
"no-unused-vars": "off"
"no-unused-vars": "off",
"header/header": "off"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

---

<!-- Please reference the issue this PR addresses. -->
<!-- Please reference the issue(s) this PR addresses. -->

See #
Fixes #
16 changes: 0 additions & 16 deletions .github/workflows/bundle-size.yml

This file was deleted.

87 changes: 87 additions & 0 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
name: Continuous Deployment

on:
release:
types:
- published

jobs:
release:
name: Upload release assets
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Read .nvmrc
run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
id: nvm

- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: "${{ steps.nvm.outputs.NVMRC }}"

- name: Setup npm cache
uses: pat-s/always-upload-cache@v1.1.4
with:
path: node_modules
key: ${{ runner.OS }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.OS }}-npm-${{ env.cache-name }}-
${{ runner.OS }}-npm-
${{ runner.OS }}-
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '7.4'
coverage: none
tools: composer

- name: Get Composer cache directory
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Setup Composer cache
uses: pat-s/always-upload-cache@v1.1.4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: npm install
env:
CI: TRUE

- name: Bundle plugin
run: |
npm run build:plugin
npm run bundle-plugin web-stories.zip
npm run bundle-plugin web-stories-composer.zip -- --composer
- name: Get upload url
run: echo "::set-output name=upload_url::https://uploads.github.com/repos/$GITHUB_REPOSITORY/releases/$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH)/assets{?name,label}"
id: release

- name: Upload full bundle
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: /build/web-stories.zip
asset_name: web-stories.zip
asset_content_type: application/zip

- name: Upload composer bundle
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.release.outputs.upload_url }}
asset_path: /build/web-stories-composer.zip
asset_name: web-stories-composer.zip
asset_content_type: application/zip
Loading

0 comments on commit 880b46e

Please sign in to comment.