Merge branch 'develop' of https://github.com/Swiftzerr/Cider
Conflicts: .gitignore src/i18n/README.md src/i18n/en_OWO.jsonc src/i18n/en_PISS.jsonc src/i18n/en_SGA.jsonc src/i18n/en_US.jsonc src/i18n/ja_JP.jsonc src/i18n/ko_KR.jsonc src/i18n/zh_CN.jsonc src/i18n/zh_HK.jsonc src/i18n/zh_TW.jsonc src/i18n/zh_yue.jsonc src/main/base/app.ts src/main/base/browserwindow.ts src/main/base/store.ts src/main/base/utils.ts src/main/plugins/thumbar.ts src/renderer/audio/audio.js src/renderer/index.js src/renderer/style.less src/renderer/views/app/chrome-top.ejs src/renderer/views/pages/settings.ejs
This commit is contained in:
commit
4cd7e9729f
42 changed files with 4256 additions and 2573 deletions
|
@ -15,7 +15,7 @@ jobs:
|
|||
- yarn-packages-{{ checksum "yarn.lock" }}
|
||||
- run:
|
||||
name: Install Dependencies
|
||||
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
|
||||
command: yarn install --cache-folder ~/.cache/yarn
|
||||
- save_cache:
|
||||
name: Save Yarn Package Cache
|
||||
key: yarn-packages-{{ checksum "yarn.lock" }}
|
||||
|
@ -34,6 +34,9 @@ jobs:
|
|||
sudo apt-get install -y wine32
|
||||
- store_test_results:
|
||||
path: test-results
|
||||
- run:
|
||||
name: Append Commit SHA to Version
|
||||
command: yarn circle:append-sha
|
||||
- run:
|
||||
name: Generate Builds (Linux)
|
||||
command: yarn dist -l -p never
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue