forked from shiftkey/desktop
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into pr/10243
- Loading branch information
Showing
175 changed files
with
4,142 additions
and
2,631 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
|
|
@@ -3,3 +3,5 @@ | |
| # might be included when linting | ||
| app/coverage | ||
| script/coverage | ||
| node_modules | ||
| app/node_modules | ||
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,81 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - development | ||
| - __release-* | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| build: | ||
| name: ${{ matrix.friendlyName }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: [macos-10.15, windows-2019] | ||
| include: | ||
| - os: macos-10.15 | ||
| friendlyName: macOS | ||
| - os: windows-2019 | ||
| friendlyName: Windows | ||
| timeout-minutes: 30 | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| submodules: recursive | ||
| - name: Use Node.js 12.8.1 | ||
| uses: actions/setup-node@v1 | ||
| with: | ||
| node-version: 12.8.1 | ||
|
|
||
| - name: Get yarn cache directory path | ||
| id: yarn-cache-dir-path | ||
| run: echo "::set-output name=dir::$(yarn cache dir)" | ||
|
|
||
| - uses: actions/cache@v2 | ||
| id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) | ||
| with: | ||
| path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
| key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} | ||
| ${{ runner.os }}-yarn- | ||
| - name: Install and build dependencies | ||
| run: yarn | ||
| - name: Pre-build checks (Linting) | ||
| run: | | ||
| yarn lint | ||
| yarn validate-changelog | ||
| yarn check-modified | ||
| - name: Build production app | ||
| run: yarn build:prod | ||
| env: | ||
| DESKTOP_OAUTH_CLIENT_ID: ${{ secrets.DESKTOP_OAUTH_CLIENT_ID }} | ||
| DESKTOP_OAUTH_CLIENT_SECRET: | ||
| ${{ secrets.DESKTOP_OAUTH_CLIENT_SECRET }} | ||
| APPLE_ID: ${{ secrets.APPLE_ID }} | ||
| APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} | ||
| DESKTOPBOT_TOKEN: ${{ secrets.DESKTOPBOT_TOKEN }} | ||
| KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} | ||
| - name: Prepare testing environment | ||
| run: yarn test:setup | ||
| - name: Run unit tests | ||
| run: yarn test:unit:cov | ||
| - name: Run script tests | ||
| run: yarn test:script:cov | ||
| - name: Run integration tests | ||
| run: yarn test:integration | ||
| - name: Publish production app | ||
| run: yarn run publish | ||
| env: | ||
| DESKTOPBOT_TOKEN: ${{ secrets.DESKTOPBOT_TOKEN }} | ||
| WINDOWS_CERT_PASSWORD: ${{ secrets.WINDOWS_CERT_PASSWORD }} | ||
| KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} | ||
| DEPLOYMENT_SECRET: ${{ secrets.DEPLOYMENT_SECRET }} | ||
| S3_KEY: ${{ secrets.S3_KEY }} | ||
| S3_SECRET: ${{ secrets.S3_SECRET }} | ||
| S3_BUCKET: github-desktop | ||
| timeout-minutes: 5 |
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,4 +1,4 @@ | ||
| runtime = electron | ||
| disturl = https://atom.io/download/electron | ||
| target = 7.1.8 | ||
| target = 9.1.2 | ||
| arch = x64 |
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
Oops, something went wrong.