Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move config files to under the optuna_dashboard directory. #847

Merged
merged 5 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .github/workflows/e2e-dashboard-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ on:
- '**.py'
- '**.ts'
- '**.tsx'
- 'package.json'
- 'package-lock.json'
- 'tsconfig.json'
- 'optuna_dashboard/package.json'
- 'optuna_dashboard/package-lock.json'
- 'optuna_dashboard/tsconfig.json'
jobs:
test:
runs-on: ubuntu-20.04
Expand All @@ -24,8 +24,12 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '16'
- run: npm install
- run: npm run build:dev

- name: Build bundle.js
working-directory: optuna_dashboard
run: |
npm install
npm run build:dev

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '16'
- run: npm install
- run: npm run build:prd

- name: Build bundle.js
working-directory: optuna_dashboard
run: |
npm install
npm run build:prd

- name: Set up Python
uses: actions/setup-python@v4
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/typescript-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ on:
- '.eslintrc.js'
- '**.ts'
- '**.tsx'
- 'package.json'
- 'package-lock.json'
- 'tsconfig.json'
- 'optuna_dashboard/package.json'
- 'optuna_dashboard/package-lock.json'
- 'optuna_dashboard/tsconfig.json'
- 'optuna_dashboard/webpack.config.js'
jobs:
lint:
name: Lint checking on Ubuntu
Expand Down Expand Up @@ -37,7 +38,9 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '16'
- run: |
- name: Build bundle.js
working-directory: optuna_dashboard
run: |
npm install
npm run build:dev
npm run build:prd
Expand All @@ -54,6 +57,8 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '16'
- run: |
- name: Run jest
working-directory: optuna_dashboard
run: |
npm install
npm run test
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The repository is organized as follows:
Node.js v16 is required to compile TypeScript files.

```
$ cd optuna_dashboard/
$ npm install
$ npm run build:dev
```
Expand All @@ -34,6 +35,7 @@ $ npm run build:dev
<summary>Watch for files changes</summary>

```
$ cd optuna_dashboard/
$ npm run watch
```

Expand All @@ -43,6 +45,7 @@ $ npm run watch
<summary>Production builds</summary>

```
$ cd optuna_dashboard/
$ npm run build:prd
```

Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:20 AS front-builder
WORKDIR /usr/src
WORKDIR /usr/src/optuna_dashboard

ADD ./package.json /usr/src/package.json
ADD ./package-lock.json /usr/src/package-lock.json
ADD ./optuna_dashboard/package.json /usr/src/optuna_dashboard/package.json
ADD ./optuna_dashboard/package-lock.json /usr/src/optuna_dashboard/package-lock.json
RUN npm install

ADD ./tsconfig.json /usr/src/tsconfig.json
ADD ./webpack.config.js /usr/src/webpack.config.js
ADD ./optuna_dashboard/tsconfig.json /usr/src/optuna_dashboard/tsconfig.json
ADD ./optuna_dashboard/webpack.config.js /usr/src/optuna_dashboard/webpack.config.js
ADD ./optuna_dashboard/ts/ /usr/src/optuna_dashboard/ts
RUN mkdir -p /usr/src/optuna_dashboard/public
RUN npm run build:prd
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ vscode/assets/bundle.js: $(RUSTLIB_OUT) $(STANDALONE_SRC)
cd standalone_app && npm install && npm run build:vscode

$(DASHBOARD_TS_OUT): $(DASHBOARD_TS_SRC)
npm install && npm run build:$(MODE)
cd optuna_dashboard && npm install && npm run build:$(MODE)

.PHONY: serve-browser-app
serve-browser-app: $(RUSTLIB_OUT)
Expand Down
File renamed without changes.
Loading
Loading