-
Notifications
You must be signed in to change notification settings - Fork 630
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2630 from popcorn-official/development
- Loading branch information
Showing
59 changed files
with
2,754 additions
and
1,548 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,10 +28,10 @@ jobs: | |
| with: | ||
| just-include: true | ||
|
|
||
| - name: Use Node.js 12.x | ||
| - name: Use Node.js 14.x | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 12.x | ||
| node-version: 14.x | ||
|
|
||
| - name: yarn version | ||
| run: | | ||
|
|
@@ -140,18 +140,6 @@ jobs: | |
| asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}.pkg | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [macOS-update] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
| uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: ./macOS-latest/update-${{ steps.get_version.outputs.VERSION }}-osx64.zip | ||
| asset_name: update-${{ steps.get_version.outputs.VERSION }}-osx64.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [ubuntu-deb-amd64] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
|
|
@@ -176,18 +164,6 @@ jobs: | |
| asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux64.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [ubuntu-update-x64] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
| uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}-linux64.zip | ||
| asset_name: update-${{ steps.get_version.outputs.VERSION }}-linux64.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [ubuntu-deb-i386] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
|
|
@@ -212,18 +188,6 @@ jobs: | |
| asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-linux32.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [ubuntu-update-x32] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
| uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: ./ubuntu-latest/update-${{ steps.get_version.outputs.VERSION }}-linux32.zip | ||
| asset_name: update-${{ steps.get_version.outputs.VERSION }}-linux32.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [windows-zip-x64] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
|
|
@@ -271,27 +235,3 @@ jobs: | |
| asset_path: ./windows-latest/Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe | ||
| asset_name: Popcorn-Time-${{ steps.get_version.outputs.VERSION }}-win32-Setup.exe | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [window-update-x64] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
| uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}-win64.zip | ||
| asset_name: update-${{ steps.get_version.outputs.VERSION }}-win64.zip | ||
| asset_content_type: application/octet-stream | ||
|
|
||
| - name: Upload Release Asset [window-update-ia32] | ||
| if: startsWith(github.ref, 'refs/tags/v') | ||
| continue-on-error: true | ||
| uses: actions/[email protected] | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| with: | ||
| upload_url: ${{ steps.create_release.outputs.upload_url }} | ||
| asset_path: ./windows-latest/update-${{ steps.get_version.outputs.VERSION }}-win32.zip | ||
| asset_name: update-${{ steps.get_version.outputs.VERSION }}-win32.zip | ||
| asset_content_type: application/octet-stream | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| module.exports = { | ||
| localesPath: 'src/app/language', | ||
| srcPath: 'src/app', | ||
| srcExtensions: ['js', 'tpl'], | ||
| flatTranslations: true | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.