Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit 7500160

Browse files
authored
Merge pull request #72 from jtpio/releaser
Add check release workflow on CI and CHANGELOG.md
2 parents aa0d559 + 7c96704 commit 7500160

File tree

9 files changed

+217
-26
lines changed

9 files changed

+217
-26
lines changed

.github/workflows/check-release.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Check Release
2+
on:
3+
push:
4+
branches:
5+
- "*"
6+
pull_request:
7+
branches:
8+
- "*"
9+
10+
permissions:
11+
contents:
12+
write
13+
14+
jobs:
15+
check_release:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
- name: Install Python
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: 3.9
24+
architecture: "x64"
25+
- name: Install node
26+
uses: actions/setup-node@v2
27+
with:
28+
node-version: '14.x'
29+
- name: Get pip cache dir
30+
id: pip-cache
31+
run: |
32+
echo "::set-output name=dir::$(pip cache dir)"
33+
- name: Cache pip
34+
uses: actions/cache@v1
35+
with:
36+
path: ${{ steps.pip-cache.outputs.dir }}
37+
key: ${{ runner.os }}-pip-${{ hashFiles('setup.py') }}
38+
restore-keys: |
39+
${{ runner.os }}-pip-
40+
- name: Cache checked links
41+
uses: actions/cache@v2
42+
with:
43+
path: ~/.cache/pytest-link-check
44+
key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/.md') }}-md-links
45+
restore-keys: |
46+
${{ runner.os }}-linkcheck-
47+
- name: Check Release
48+
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
49+
with:
50+
token: ${{ secrets.GITHUB_TOKEN }}
51+
env:
52+
RH_VERSION_SPEC: 3.0.0-1

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ jobs:
2727
python -m pip install jupyterlab~=3.0.11
2828
- name: Install & lint
2929
run: |
30-
jlpm
31-
jlpm eslint:check
30+
yarn
31+
yarn eslint:check
3232
- name: Build
3333
run: |
34-
jlpm run build
34+
yarn run build
3535
- name: Launch JupyterLab
3636
run: |
37-
jlpm run start:detached
37+
yarn run start:detached
3838
- name: Wait for JupyterLab
3939
uses: ifaxity/wait-on-action@v1
4040
with:
4141
resource: http-get://localhost:8888/api
4242
timeout: 20000
4343
- name: Test
4444
run: |
45-
jlpm run test:ci
45+
yarn run test:ci

CHANGELOG.md

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# Changelog
2+
3+
<!-- <START NEW CHANGELOG ENTRY> -->
4+
5+
## [v3.0.11-2](https://github.com/jupyterlab/galata/tree/v3.0.11-2)
6+
7+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.11-1...v3.0.11-2)
8+
9+
### Changes
10+
11+
- Bump postcss from 7.0.35 to 7.0.36 [\#64](https://github.com/jupyterlab/galata/pull/64) (@dependabot[bot])
12+
- increment version for 3.0.11-2 release [\#63](https://github.com/jupyterlab/galata/pull/63) (@mbektas)
13+
- fix jlpm build output dir [\#62](https://github.com/jupyterlab/galata/pull/62) (@mbektas)
14+
- Wait fixes [\#61](https://github.com/jupyterlab/galata/pull/61) (@mbektas)
15+
- Allow for custom tab bar and nb toolbar item ids [\#48](https://github.com/jupyterlab/galata/pull/48) (@fcollonval)
16+
17+
<!-- <END NEW CHANGELOG ENTRY> -->
18+
19+
## [v3.0.11-1](https://github.com/jupyterlab/galata/tree/v3.0.11-1)
20+
21+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-7...v3.0.11-1)
22+
23+
### Changes
24+
25+
- Update to JupyterLab 3.0.11 and lerna [\#57](https://github.com/jupyterlab/galata/pull/57) (@jtpio)
26+
- Update release instructions [\#56](https://github.com/jupyterlab/galata/pull/56) (@jtpio)
27+
- Add linter [\#55](https://github.com/jupyterlab/galata/pull/55) (@fcollonval)
28+
29+
## [v3.0.7-7](https://github.com/jupyterlab/galata/tree/v3.0.7-7)
30+
31+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-6...v3.0.7-7)
32+
33+
### Changes
34+
35+
- Update to 3.0.7-7 [\#52](https://github.com/jupyterlab/galata/pull/52) (@jtpio)
36+
- Switch from npm to jlpm [\#50](https://github.com/jupyterlab/galata/pull/50) (@jtpio)
37+
- Move the debugger sidebar to the left in moveAllTabsToLeft [\#45](https://github.com/jupyterlab/galata/pull/45) (@jtpio)
38+
39+
## [v3.0.7-6](https://github.com/jupyterlab/galata/tree/v3.0.7-6)
40+
41+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-5...v3.0.7-6)
42+
43+
### Changes
44+
45+
- increment version for 3.0.7-6 release [\#44](https://github.com/jupyterlab/galata/pull/44) (@mbektas)
46+
- fix notebook close issues [\#43](https://github.com/jupyterlab/galata/pull/43) (@mbektas)
47+
48+
## [v3.0.7-5](https://github.com/jupyterlab/galata/tree/v3.0.7-5)
49+
50+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-4...v3.0.7-5)
51+
52+
### Changes
53+
54+
- increment version for 3.0.7-5 release [\#42](https://github.com/jupyterlab/galata/pull/42) (@mbektas)
55+
- Add/set cell using UI actions [\#41](https://github.com/jupyterlab/galata/pull/41) (@mbektas)
56+
57+
## [v3.0.7-4](https://github.com/jupyterlab/galata/tree/v3.0.7-4)
58+
59+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-3...v3.0.7-4)
60+
61+
### Changes
62+
63+
- increment version for 3.0.7-4 release [\#40](https://github.com/jupyterlab/galata/pull/40) (@mbektas)
64+
- API enhancements [\#39](https://github.com/jupyterlab/galata/pull/39) (@mbektas)
65+
- Add release instructions [\#38](https://github.com/jupyterlab/galata/pull/38) (@mbektas)
66+
67+
## [v3.0.7-3](https://github.com/jupyterlab/galata/tree/v3.0.7-3)
68+
69+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-2...v3.0.7-3)
70+
71+
### Changes
72+
73+
- increment version for 3.0.7-3 release [\#37](https://github.com/jupyterlab/galata/pull/37) (@mbektas)
74+
75+
## [v3.0.7-2](https://github.com/jupyterlab/galata/tree/v3.0.7-2)
76+
77+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.7-1...v3.0.7-2)
78+
79+
### Changes
80+
81+
- increment version for 3.0.7-2 release [\#35](https://github.com/jupyterlab/galata/pull/35) (@mbektas)
82+
- add theme API & configuration [\#33](https://github.com/jupyterlab/galata/pull/33) (@mbektas)
83+
- update Mehmet's github handle [\#31](https://github.com/jupyterlab/galata/pull/31) (@mbektas)
84+
85+
## [v3.0.7-1](https://github.com/jupyterlab/galata/tree/v3.0.7-1)
86+
87+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.3-3...v3.0.7-1)
88+
89+
### Changes
90+
91+
- Enhancements to handle end-to-end JupyterLab UI testing [\#36](https://github.com/jupyterlab/galata/pull/36) (@mbektas)
92+
- upgrade to jupyterlab 3.0.7 [\#29](https://github.com/jupyterlab/galata/pull/29) (@mbektas)
93+
- close all tabs more reliably [\#28](https://github.com/jupyterlab/galata/pull/28) (@mbektas)
94+
- Rename report.html to index.html [\#27](https://github.com/jupyterlab/galata/pull/27) (@jtpio)
95+
- Create reference and output dirs if they don't exist [\#26](https://github.com/jupyterlab/galata/pull/26) (@martinRenou)
96+
- switch workflow to main branch [\#22](https://github.com/jupyterlab/galata/pull/22) (@mbektas)
97+
- upgrade ansi\_up dependency to 5.0.0 to resolve vulnerability [\#20](https://github.com/jupyterlab/galata/pull/20) (@mbektas)
98+
99+
## [v3.0.3-3](https://github.com/jupyterlab/galata/tree/v3.0.3-3)
100+
101+
[Full Changelog](https://github.com/jupyterlab/galata/compare/v3.0.3-2...v3.0.3-3)
102+
103+
### Changes
104+
105+
- Publish 3.0.3-3 for security patch [\#19](https://github.com/jupyterlab/galata/pull/19) (@mbektas)
106+
- upgrade axios package to resolve security vulnerability [\#18](https://github.com/jupyterlab/galata/pull/18) (@mbektas)
107+
- Add getting started section [\#17](https://github.com/jupyterlab/galata/pull/17) (@mbektas)
108+
109+
## [v3.0.3-2](https://github.com/jupyterlab/galata/tree/v3.0.3-2)
110+
111+
[Full Changelog](https://github.com/jupyterlab/galata/compare/31767100603daa49e2cb6b7466451be5f76f4ac2...v3.0.3-2)
112+
113+
### Changes
114+
115+
- publish 3.0.3-2 [\#16](https://github.com/jupyterlab/galata/pull/16) (@mbektas)
116+
- Update authors and acknowledgement [\#15](https://github.com/jupyterlab/galata/pull/15) (@jtpio)
117+
- Add link to the Jupyter Code of Conduct [\#13](https://github.com/jupyterlab/galata/pull/13) (@jtpio)
118+
- Add jlab wait [\#12](https://github.com/jupyterlab/galata/pull/12) (@mbektas)
119+
- Playwright [\#11](https://github.com/jupyterlab/galata/pull/11) (@mbektas)
120+
- Rename jlt to galata, detect image size differences [\#10](https://github.com/jupyterlab/galata/pull/10) (@mbektas)
121+
- Enforce version match [\#9](https://github.com/jupyterlab/galata/pull/9) (@mbektas)
122+
- properly exit process after flushing logs [\#8](https://github.com/jupyterlab/galata/pull/8) (@mbektas)
123+
- Add workflow to run galata tests on CI [\#7](https://github.com/jupyterlab/galata/pull/7) (@jtpio)
124+
- Provide default path to chromium on Linux [\#6](https://github.com/jupyterlab/galata/pull/6) (@jtpio)
125+
- Add a screencast to README.md to demo Galata [\#5](https://github.com/jupyterlab/galata/pull/5) (@jtpio)
126+
- Update to JupyterLab 3 and webpack 5 [\#2](https://github.com/jupyterlab/galata/pull/2) (@jtpio)

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ git clone https://github.com/jupyterlab/galata.git
3333
cd galata/packages/galata-example
3434

3535
# install dependencies
36-
jlpm
36+
yarn
3737

3838
# build
39-
jlpm run build
39+
yarn run build
4040

4141
# run test suites using `test` script which calls `galata` CLI script
42-
jlpm run test
42+
yarn run test
4343
```
4444

4545
Galata should generate console output similar to following
@@ -51,7 +51,7 @@ Galata should generate console output similar to following
5151

5252
```
5353

54-
You can edit the test suite file [`galata-example/tests/test.test.ts`](packages/galata-example/tests/test.test.ts) or add more test suites to the [`galata-example/tests`](packages/galata-example/tests/) directory. You can pass additional [command-line options](#command-line-options) to Galata by appending them to the `jlpm run test` command such as `jlpm run test -- --no-headless`.
54+
You can edit the test suite file [`galata-example/tests/test.test.ts`](packages/galata-example/tests/test.test.ts) or add more test suites to the [`galata-example/tests`](packages/galata-example/tests/) directory. You can pass additional [command-line options](#command-line-options) to Galata by appending them to the `yarn run test` command such as `yarn run test -- --no-headless`.
5555

5656
Additional test suite examples are available in [`galata/tests`](packages/galata/tests/). They contain examples of creating notebooks, uploading notebooks to JupyterLab, running notebooks and taking screenshots.
5757

@@ -68,8 +68,8 @@ Galata package is versioned with the same major, minor and patch versions as the
6868

6969
Install dependencies and build
7070
```
71-
jlpm
72-
jlpm run build
71+
yarn
72+
yarn run build
7373
```
7474

7575
For tests to be run, a JupyterLab instance must be up and running. Launch it without credentials. Tests expect to connect JupyterLab from `localhost:8888` by default. If a different URL is to be used, it can be specified using Galata's `--jlab-base-url` command line argument. If your tests are modifying files (upload / rename / delete), or taking captures that include file explorer then it is suggested to launch JupyterLab from inside an empty directory.
@@ -81,11 +81,11 @@ Galata uses headless browser to launch JupyterLab and runs tests in. Browser can
8181
Galata can also connect to Browser via a remote debugging URL. It can be specified using `--browser-url`.
8282

8383
## Running tests
84-
There are two projects in this mono-repo. `galata` core project and `galata-example` project which is a boilerplate project that shows how `galata` can be integrated into a node project. Both of these projects contain some test suites that serve as unit tests and examples. You can run them using `lerna run test` or `jlpm run test` in each project's root directory. It is suggested to run tests in each projects directory as below. Otherwise you need to run `lerna run test --stream` to see detailed result of each test in a test suite.
84+
There are two projects in this mono-repo. `galata` core project and `galata-example` project which is a boilerplate project that shows how `galata` can be integrated into a node project. Both of these projects contain some test suites that serve as unit tests and examples. You can run them using `lerna run test` or `yarn run test` in each project's root directory. It is suggested to run tests in each projects directory as below. Otherwise you need to run `lerna run test --stream` to see detailed result of each test in a test suite.
8585

8686
```
8787
cd packages/galata
88-
jlpm run test
88+
yarn run test
8989
```
9090

9191
## Configuration

RELEASE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
2. Re-install dependencies and rebuild.
1010

1111
```
12-
jlpm
13-
jlpm run build
12+
yarn
13+
yarn run build
1414
```
1515

1616
3. Run tests and make sure that all pass. Before running tests, JupyterLab must be up and running. You can use the launch command described in `Launch JupyterLab` section of [README.md](README.md#launch-jupyterlab)
1717

1818
```
19-
jlpm run test
19+
yarn run test
2020
```
2121

2222
4. Commit your version changes.

lerna.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "independent",
3-
"npmClient": "jlpm",
2+
"version": "3.0.11-2",
3+
"npmClient": "yarn",
44
"useWorkspaces": true
55
}

package.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
2-
"name": "root",
2+
"name": "@jupyterlab/galata-root",
3+
"version": "0.1.0",
34
"private": true,
45
"scripts": {
56
"build": "lerna run build",
67
"eslint": "eslint . --ext .js,.ts,.tsx --fix",
78
"eslint:check": "eslint . --ext .js,.ts,.tsx",
89
"install": "lerna bootstrap",
910
"start": "jupyter lab --config ./jupyter_server_config.py",
10-
"start:detached": "(jlpm run start&)",
11+
"start:detached": "(yarn run start&)",
1112
"test": "lerna run test --stream",
1213
"test:ci": "lerna run test --stream --scope @jupyterlab/galata"
1314
},
@@ -24,5 +25,17 @@
2425
"packages": [
2526
"packages/*"
2627
]
28+
},
29+
"jupyter-releaser": {
30+
"hooks": {
31+
"before-build-npm": [
32+
"yarn run build"
33+
]
34+
},
35+
"options": {
36+
"version-cmd": [
37+
"yarn run lerna version --force-publish --no-push --no-git-tag-version --exact --yes"
38+
]
39+
}
2740
}
2841
}

packages/galata-example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "galata-example",
3-
"version": "1.0.0",
3+
"version": "3.0.11-2",
44
"description": "Galata Example",
55
"private": true,
66
"scripts": {

packages/galata/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"build:galata": "tsc",
1717
"save-jlab-version": "node ./bin/buildutil.js --save-jlab-version",
1818
"enforce-version-match": "node ./bin/buildutil.js --enforce-version-match",
19-
"build": "jlpm run clean && jlpm run save-jlab-version && jlpm run build:inpage && jlpm run build:galata",
20-
"prepublishOnly": "jlpm run build && jlpm run enforce-version-match",
19+
"build": "yarn run clean && yarn run save-jlab-version && yarn run build:inpage && yarn run build:galata",
20+
"prepublishOnly": "yarn run build && yarn run enforce-version-match",
2121
"test": "node ./bin/cli.js"
2222
},
2323
"files": [
@@ -52,6 +52,7 @@
5252
"ansi_up": "^5.0.0",
5353
"axios": "^0.21.1",
5454
"chalk": "^4.0.0",
55+
"cross-spawn": "^6.0.5",
5556
"dateformat": "^3.0.3",
5657
"ejs": "^3.0.1",
5758
"events": "^3.0.0",
@@ -61,14 +62,13 @@
6162
"jest": "^25.1.0",
6263
"js-beautify": "^1.10.3",
6364
"meow": "^6.0.1",
65+
"open": "^7.0.4",
6466
"pixelmatch": "^5.1.0",
65-
"pngjs": "^3.4.0",
6667
"playwright": "^1.9.1",
68+
"pngjs": "^3.4.0",
6769
"semver": "^7.3.2",
6870
"ts-jest": "^25.2.0",
6971
"typescript": "^3.7.4",
70-
"cross-spawn": "^6.0.5",
71-
"open": "^7.0.4",
7272
"uuid": "^3.4.0"
7373
},
7474
"devDependencies": {

0 commit comments

Comments
 (0)