align CI with the upstream settings for Actions (#393)

shiftkey · Dec 18, 2020 · 745c5df · 745c5df
1 parent b013b2b
commit 745c5df
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 101 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,8 +4,14 @@ on:
   push:
     branches:
       - development
-      - __release-*
+      - linux
+      - 'linux-release-*'
+    tags:
+      - 'release-*.*.*-linux*'
   pull_request:
+    branches:
+      - linux
+      - 'linux-release-*'
 
 jobs:
   build:
@@ -15,12 +21,14 @@ jobs:
       fail-fast: false
       matrix:
         node: [12.14.1]
-        os: [macos-10.15, windows-2019]
+        os: [macos-10.15, windows-2019, ubuntu-20.04]
         include:
           - os: macos-10.15
             friendlyName: macOS
           - os: windows-2019
             friendlyName: Windows
+          - os: ubuntu-20.04
+            friendlyName: Ubuntu
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v2
@@ -46,22 +54,12 @@ jobs:
 
       - name: Install and build dependencies
         run: yarn
-      - name: Lint
-        run: yarn lint
       - name: Validate changelog
         run: yarn validate-changelog
       - name: Ensure a clean working directory
         run: 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
@@ -70,13 +68,3 @@ jobs:
         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
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,7 +13,8 @@ on:
       - 'linux-release-*'
 
 jobs:
-  build:
+  run:
+    name: 'Check source code'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,38 +27,6 @@ pr:
       - '*'
 
 jobs:
-  - job: Windows
-    pool:
-      vmImage: windows-2019
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: '10.x'
-      - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-        inputs:
-          versionSpec: '1.5.1'
-      - script: |
-          yarn install --force
-        name: Install
-      - script: |
-          yarn build:prod
-        name: Build
-      - script: |
-          yarn test:setup && yarn test
-        name: Test
-      - task: PublishTestResults@2
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**junit*.xml'
-          testRunTitle: $(Agent.OS) Test Results
-        condition: always()
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage results'
-        inputs:
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: '**/app/coverage/cobertura-coverage.xml'
-        condition: always()
-
   - job: Linux
     pool:
       vmImage: ubuntu-16.04
@@ -103,15 +71,3 @@ jobs:
         condition:
           and(succeeded(), startsWith(variables['Build.SourceBranch'],
           'refs/tags/'))
-      - task: PublishTestResults@2
-        displayName: 'Publish Test Results'
-        inputs:
-          testResultsFiles: '**junit*.xml'
-          testRunTitle: $(Agent.OS) Test Results
-        condition: always()
-      - task: PublishCodeCoverageResults@1
-        displayName: 'Publish code coverage results'
-        inputs:
-          codeCoverageTool: 'cobertura'
-          summaryFileLocation: '**/app/coverage/cobertura-coverage.xml'
-        condition: always()