-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into develop
- Loading branch information
Showing
7 changed files
with
83 additions
and
11 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 |
|---|---|---|
|
|
@@ -87,7 +87,7 @@ jobs: | |
| restore-keys: | | ||
| ${{ runner.os }}-electron-builder-cache- | ||
| - name: "'pnpm install --force' Because we need to install optional dependencies" | ||
| - name: "'pnpm install' Because we need to install optional dependencies" | ||
| run: | | ||
| echo "======================================================================"; | ||
| dir || ls -lah; | ||
|
|
@@ -144,10 +144,15 @@ jobs: | |
| cd packages/gui/dist_electron; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz; | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz; | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz; | ||
| ls -lah; | ||
| - name: 'Rename artifacts - macOS' | ||
| if: ${{ matrix.os == 'macos' }} | ||
|
|
@@ -204,6 +209,14 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| if-no-files-found: error | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
|
|
@@ -218,6 +231,14 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| if-no-files-found: error | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
|
|
@@ -232,6 +253,13 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| if-no-files-found: error | ||
| #endregion Upload artifacts - Linux | ||
|
|
||
| # Upload artifacts - macOS | ||
|
|
@@ -263,11 +291,6 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| needs: | ||
| - build-and-upload | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| preReleaseVersion: | ||
| - '' | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/[email protected] | ||
|
|
@@ -313,6 +336,12 @@ jobs: | |
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' | ||
| path: release | ||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| path: release | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' | ||
| uses: actions/[email protected] | ||
| with: | ||
|
|
@@ -323,6 +352,12 @@ jobs: | |
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' | ||
| path: release | ||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| path: release | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' | ||
| uses: actions/[email protected] | ||
| with: | ||
|
|
@@ -333,6 +368,11 @@ jobs: | |
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' | ||
| path: release | ||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| uses: actions/[email protected] | ||
| with: | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| path: release | ||
|
|
||
| - name: 'Download DevSidecar-${{ steps.package-info.outputs.version }}-macos-x64.dmg' | ||
| uses: actions/[email protected] | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -94,7 +94,7 @@ jobs: | |
| restore-keys: | | ||
| ${{ runner.os }}-electron-builder-cache- | ||
| - name: "'pnpm install --force' Because we need to install optional dependencies" | ||
| - name: "'pnpm install' Because we need to install optional dependencies" | ||
| run: | | ||
| echo "======================================================================"; | ||
| dir || ls -lah; | ||
|
|
@@ -151,10 +151,15 @@ jobs: | |
| cd packages/gui/dist_electron; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-amd64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-amd64.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-x86_64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-x64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz; | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-arm64.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz; | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.deb DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.AppImage DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage; | ||
| mv DevSidecar-${{ steps.package-info.outputs.version }}-armv7l.tar.gz DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz; | ||
| ls -lah; | ||
| - name: 'Rename artifacts - macOS' | ||
| if: ${{ matrix.os == 'macos' }} | ||
|
|
@@ -211,6 +216,14 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x86_64.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-x64.tar.gz' | ||
| if-no-files-found: error | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.deb' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
|
|
@@ -225,6 +238,14 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-arm64.tar.gz' | ||
| if-no-files-found: error | ||
| #------------------------------------------------------------------------------------------------------------------------- | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.deb' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
|
|
@@ -239,6 +260,13 @@ jobs: | |
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.AppImage' | ||
| if-no-files-found: error | ||
| - name: 'Upload DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| uses: actions/[email protected] | ||
| if: ${{ matrix.os == 'ubuntu' }} | ||
| with: | ||
| path: packages/gui/dist_electron/DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz | ||
| name: 'DevSidecar-${{ steps.package-info.outputs.version }}-linux-armv7l.tar.gz' | ||
| if-no-files-found: error | ||
| #endregion Upload artifacts - Linux | ||
|
|
||
| # Upload artifacts - macOS | ||
|
|
||
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 |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "name": "@docmirror/dev-sidecar-gui", | ||
| "version": "2.0.0-RC6", | ||
| "version": "2.0.0", | ||
| "private": false, | ||
| "author": { | ||
| "email": "[email protected]", | ||
|
|
||
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