Skip to content

Commit

Permalink
Merge pull request #475 from MrBrax/develop-ts
Browse files Browse the repository at this point in the history
big breaking changes
  • Loading branch information
MrBrax authored Nov 14, 2023
2 parents ba49910 + ebd742e commit deef7ac
Show file tree
Hide file tree
Showing 3,071 changed files with 53,886 additions and 60,320 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/check-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: yarn install, lint and build
run: |
cd ./twitch-vod-chat
yarn install --immutable --immutable-cache
yarn install --immutable
yarn buildlib
cd ../client-vue
yarn install --immutable --immutable-cache
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/publish-develop-release.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name: Publish develop release

on:
push:
branches:
- develop-ts

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
submodules: "true"
# - name: Install dependencies
# run: yarn install
- name: Run pack (also releases to GitHub)
run: chmod +x ./pack-dev.sh && ./pack-dev.sh
env:
name: Publish develop release

on:
push:
branches:
- develop-ts

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
with:
submodules: "true"
# - name: Install dependencies
# run: yarn install
- name: Run pack (also releases to GitHub)
run: chmod +x ./packer-main.sh && ./packer-main.sh --prerelease
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
# - name: Install dependencies
# run: yarn install
- name: Run pack (also releases to GitHub)
run: chmod +x ./pack.sh && ./pack.sh
run: chmod +x ./packer-main.sh && ./packer-main.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ data/storage
data/cache
data/config
data/payloads
data/backup
release/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RUN cd /usr/local/share/twitchautomator/twitch-chat-dumper \
# vod player
COPY --chown=node:node --chmod=775 ./twitch-vod-chat /usr/local/share/twitchautomator/twitch-vod-chat
RUN cd /usr/local/share/twitchautomator/twitch-vod-chat \
&& yarn \
&& yarn install --immutable \
&& yarn build --base=/vodplayer \
&& yarn buildlib \
&& rm -rf node_modules \
Expand Down
1 change: 0 additions & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ verify_ssl = true

[packages]
yt-dlp = "*"
tcd = "*"
streamlink = "*"
vcsi = "*"

Expand Down
358 changes: 180 additions & 178 deletions Pipfile.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ If you want the public webapp to have a custom base folder, you must provide `BA
### pip packages
- [streamlink](https://github.com/streamlink/streamlink) (required)
- [yt-dlp](https://github.com/yt-dlp/yt-dlp) (not used at the moment)
- [tcd](https://github.com/PetterKraabol/Twitch-Chat-Downloader) (optional)
- [vcsi](https://github.com/amietn/vcsi) (optional)

### Steps
Expand Down
33,357 changes: 15,178 additions & 18,179 deletions client-vue/.pnp.cjs

Large diffs are not rendered by default.

Loading

0 comments on commit deef7ac

Please sign in to comment.