Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/allow-embed-code
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/main.bundle.js
  • Loading branch information
mimidotuser committed Sep 15, 2021
2 parents 09e8070 + 56a6a9a commit b808e5a
Show file tree
Hide file tree
Showing 26 changed files with 63 additions and 2,176 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,22 @@ jobs:

strategy:
matrix:
node-version: [ 8.x, 10.x, 12.x ]
node: [ 12.x, 14.x, 16.x ]

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

- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}
cache: 'yarn'

- name: Install dependencies
run: yarn --frozen-lockfile

- name: Build project
run: yarn build

- name: Cypress.io
uses: cypress-io/github-action@v2
22 changes: 10 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,24 @@ jobs:
- name: Checkout
uses: actions/checkout@v2

- name: Cache node modules
uses: actions/cache@v2
- uses: actions/setup-node@v2
with:
path: |
~/.cache/yarn
~/.cache/Cypress
**/node_modules
key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '14'
node-version: ${{ matrix.node }}
cache: 'yarn'

- name: Install dependencies
run: yarn --frozen-lockfile

- name: Build project
run: yarn build

- name: Test
uses: cypress-io/github-action@v2

- name: Compress Github release files
run: |
zip -r h5p-standalone-release.zip dist/ README.md
- name: Release
uses: cycjimmy/semantic-release-action@v2
env:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
.DS_Store
cypress/videos
cypress/videos
dist
6 changes: 5 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
test
vendor
cypress
cypress
.github
.circleci
.eslintrc.json
cypress.json
19 changes: 19 additions & 0 deletions .releaserc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"plugins": [
"@semantic-release/commit-analyzer",
"@semantic-release/release-notes-generator",
"@semantic-release/npm",
[
"@semantic-release/github",
{
"assets": [
{
"path": "h5p-standalone-release.zip",
"name": "h5p-standalone-${nextRelease.version}.zip",
"label": "h5p-standalone-${nextRelease.version}.zip"
}
]
}
]
]
}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ frameBorder="0" scrolling="no" styles="width:100%"></iframe
1. Rename the H5P file extension from `.h5p` file to `.zip`
2. Extract the renamed file contents into your workspace `h5p-folder` folder

## Testing

```
yarn test
```
## Testing during development
After modifying the project, build the files:
`` yarn build``
to run available [Cypress](https://www.cypress.io/) tests:
`` yarn test``
Binary file removed dist/fonts/h5p-core-27.eot
Binary file not shown.
113 changes: 0 additions & 113 deletions dist/fonts/h5p-core-27.svg

This file was deleted.

Binary file removed dist/fonts/h5p-core-27.ttf
Binary file not shown.
Binary file removed dist/fonts/h5p-core-27.woff
Binary file not shown.
Binary file removed dist/fonts/h5p-hub-publish.eot
Binary file not shown.
38 changes: 0 additions & 38 deletions dist/fonts/h5p-hub-publish.svg

This file was deleted.

Binary file removed dist/fonts/h5p-hub-publish.ttf
Binary file not shown.
Binary file removed dist/fonts/h5p-hub-publish.woff
Binary file not shown.
2 changes: 0 additions & 2 deletions dist/frame.bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/frame.bundle.js.LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions dist/main.bundle.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/main.bundle.js.LICENSE.txt

This file was deleted.

Loading

0 comments on commit b808e5a

Please sign in to comment.