Skip to content

Commit

Permalink
Merge branch 'dependency-updates'
Browse files Browse the repository at this point in the history
  • Loading branch information
michz committed Mar 5, 2023
2 parents 19e5022 + a32f03c commit 93c1b1b
Show file tree
Hide file tree
Showing 10 changed files with 818 additions and 3,404 deletions.
25 changes: 4 additions & 21 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,11 @@ on:
- v*

jobs:
build-cli:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- run: |
cd cli && \
yarn install --frozen-lockfile && \
yarn make
- uses: actions/upload-artifact@v3
with:
name: cli-linux
path: ./cli/dist/tally-server-*

build-ui-linux-win:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- run: sudo apt-get -y install wine64
Expand All @@ -45,8 +29,8 @@ jobs:
build-ui-macos:
runs-on: macos-11
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
- run: |
Expand All @@ -60,7 +44,6 @@ jobs:

release:
needs:
- build-cli
- build-ui-linux-win
- build-ui-macos
runs-on: ubuntu-20.04
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
dist/
node_modules/

tally-server-linux
tally-server-macos
tally-server-win.exe

tally-server.log

yarn-error.log
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,9 @@ Simply execute the exe file.
For easier module development, start with:

```
rm -rf core/node_modules cli/node_modules native-ui/node_modules
rm -rf core/node_modules native-ui/node_modules
cd core
yarn link
cd ../cli
yarn link tally-server-core
cd ../native-ui
yarn link tally-server-core
```
Expand Down
49 changes: 0 additions & 49 deletions cli/index.js

This file was deleted.

39 changes: 0 additions & 39 deletions cli/package.json

This file was deleted.

Loading

0 comments on commit 93c1b1b

Please sign in to comment.