Skip to content

Commit

Permalink
Update deploy branch
Browse files Browse the repository at this point in the history
  • Loading branch information
trungleduc committed Mar 6, 2022
1 parent d017da4 commit a22244e
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ name: Check Release
on:
push:
branches:
- main
- master
pull_request:
branches:
- main
- master

permissions:
env:
NODE_OPTIONS: --max_old_space_size=8000

permissions:
contents: write

jobs:
Expand All @@ -24,7 +27,7 @@ jobs:
- name: Install node
uses: actions/setup-node@v2
with:
node-version: '14.x'
node-version: '16.x'


- name: Get pip cache dir
Expand All @@ -50,6 +53,7 @@ jobs:
pip install --upgrade pip setuptools wheel jupyter-packaging~=0.10 --user
- name: Install Dependencies
run: |
export NODE_OPTIONS=--max_old_space_size=8000
pip install .
- name: Check Release
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
path: ./docs/_output

deploy:
if: github.ref == 'refs/heads/main'
if: github.ref == 'refs/heads/master'
needs: [build]
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# jupyterview

[![Github Actions Status](https://github.com/trungleduc/jupyterview/workflows/Build/badge.svg)](https://github.com/trungleduc/jupyterview/actions/workflows/build.yml)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/trungleduc/jupyterview/main?urlpath=lab)
[![Github Actions Status](https://github.com/trungleduc/jupyterview/workflows/Build/badge.svg)](https://github.com/trungleduc/jupyterview/actions/workflows/build.yml)[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/trungleduc/jupyterview/master?urlpath=lab)

A Jupyterlab VTK viewer extension.

Expand Down
7 changes: 4 additions & 3 deletions extension.webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ module.exports = {
extensions: ['.webpack.js', '.web.js', '.js'],
alias: {
'./itkConfig$': itkConfig
// '../itkConfig.js': itkConfig,
// '../../itkConfig.js': itkConfig
},
fallback: { fs: false, path: false, url: false, module: false }
},
Expand Down Expand Up @@ -63,5 +61,8 @@ module.exports = {
],
performance: {
maxAssetSize: 10000000
}
},
optimization: {
minimize: false
},
};
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"jupyter-releaser": {
"hooks": {
"before-build-npm": [
"python -m pip install jupyterlab~=3.1",
"python -m pip install jupyterlab~=3.3",
"jlpm"
]
}
Expand Down
9 changes: 8 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,11 @@ build_cmd = "build:prod"
npm = ["jlpm"]

[tool.check-manifest]
ignore = ["jupyterview/labextension/**", "yarn.lock", ".*", "package-lock.json"]
ignore = ["jupyterview/labextension/**",
"yarn.lock",
".*",
"package-lock.json",
"docs/**",
"extension.webpack.config.js",
"samples/**"
]

0 comments on commit a22244e

Please sign in to comment.