Skip to content

Commit

Permalink
Remove Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
lutzroeder committed Mar 4, 2023
1 parent 07a5a23 commit 63d727e
Show file tree
Hide file tree
Showing 13 changed files with 529 additions and 502 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: npm run lint

- name: Build Python Server
run: make build_python
run: npm run build python

- name: Build Electron
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,25 @@ jobs:
env:
TWINE_USERNAME: __token__
TWINE_PASSWORD: ${{ secrets.pypi_api_token }}
run: make publish_python
run: npm run publish python

- if: startsWith(matrix.os, 'ubuntu')
name: Publish Web
env:
GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}
GITHUB_USER: ${{ secrets.PUBLISH_GITHUB_USER }}
run: make publish_web
run: npm run publish web

- if: startsWith(matrix.os, 'macos')
name: Publish cask
env:
GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}
GITHUB_USER: ${{ secrets.PUBLISH_GITHUB_USER }}
run: make publish_cask
run: npm run publish cask

- if: startsWith(matrix.os, 'windows')
name: Publish winget
env:
GITHUB_TOKEN: ${{ secrets.PUBLISH_GITHUB_TOKEN }}
GITHUB_USER: ${{ secrets.PUBLISH_GITHUB_USER }}
run: make publish_winget
run: npm run publish winget
20 changes: 14 additions & 6 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,9 @@
"name": "Python Server",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/publish/python.py",
"program": "${workspaceFolder}/package.py",
"args": [ "build", "start" ],
"justMyCode": true,
"args": [
"build",
"start"
],
"pathMappings": [
{
"localRoot": "${workspaceFolder}/source",
Expand All @@ -54,13 +51,15 @@
"type": "node",
"request": "launch",
"program": "${workspaceFolder}/test/models.js",
"args": [],
"console": "integratedTerminal",
},
{
"name": "Test Backend",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/test/backend.py",
"args": [],
"console": "integratedTerminal",
"justMyCode": false,
"serverReadyAction": {
Expand All @@ -75,8 +74,17 @@
"type": "python",
"request": "launch",
"program": "${file}",
"args": [],
"console": "integratedTerminal",
"justMyCode": false
}
},
{
"name": "Task JavaScript",
"type": "node",
"request": "launch",
"program": "${workspaceFolder}/package.js",
"args": [],
"console": "integratedTerminal",
},
]
}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To debug the Electron app, open the folder in [Visual Studio Code](https://code.
To build and launch the Python server, pick `Python Server` in the `Debug` tab or run this command:

```bash
python publish/python.py build start --browse
python package.py build start --browse
```

## Validation
Expand Down
108 changes: 0 additions & 108 deletions Makefile

This file was deleted.

Loading

0 comments on commit 63d727e

Please sign in to comment.