Merge branch 'master' of https://github.com/spotify/backstage

.github/workflows/ci.yml

@@ -1,11 +1,11 @@
-name: Frontend CI
+name: CI
 
 on:
   pull_request:
     paths-ignore:
       - 'microsite/**'
 jobs:
-  build:
+  verify:
     runs-on: ubuntu-latest
 
     strategy:

.github/workflows/e2e-win.yml

@@ -1,12 +1,13 @@
-name: CLI Test Windows
+name: E2E Test Windows
 
-# Building on windows is really slow, so this workflow is separate from cli.yml and only builds on changes
+# Building on windows is really slow, so this workflow is separate from e2e.yml and only builds on changes
 # to the cli itself. They're more likely to introduce issues on windows, compared to changes to core and yarn.lock.
 on:
   pull_request:
     paths:
-      - '.github/workflows/cli-win.yml'
+      - '.github/workflows/e2e-win.yml'
       - 'packages/cli/**'
+      - 'packages/e2e/**'
       - 'packages/create-app/**'
 
 jobs:
@@ -42,6 +43,7 @@ jobs:
       - name: yarn install
         run: yarn install --frozen-lockfile
       - run: yarn tsc
-      - run: yarn build
-      - name: verify app and plugin creation
-        run: node ${{ github.workspace }}/packages/cli/e2e-test/cli-e2e-test.js
+      - name: yarn build
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+      - name: run E2E test
+        run: yarn workspace e2e-test start

.github/workflows/e2e.yml

@@ -1,11 +1,10 @@
-name: CLI Test
+name: E2E Test Linux
 
 on:
   pull_request:
     paths-ignore:
       - 'microsite/**'
 
-
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -51,13 +50,14 @@ jobs:
       - name: yarn install
         run: yarn install --frozen-lockfile
       - run: yarn tsc
-      - run: yarn build
-      - name: verify app and plugin creation
+      - name: yarn build
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+      - name: run E2E test
+        run: |
+          sudo sysctl fs.inotify.max_user_watches=524288
+          yarn workspace e2e-test start
         env:
           POSTGRES_HOST: localhost
           POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }}
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
-        run: |
-          sudo sysctl fs.inotify.max_user_watches=524288
-          node ${{ github.workspace }}/packages/cli/e2e-test/cli-e2e-test.js

.github/workflows/master-win.yml

@@ -0,0 +1,47 @@
+name: Master Build Windows
+
+on:
+  push:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x]
+
+    env:
+      CI: true
+      NODE_OPTIONS: --max-old-space-size=4096
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: find location of global yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - name: cache global yarn cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: cache node_modules
+        uses: actions/cache@v2
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
+      - name: use node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: https://registry.npmjs.org/ # Needed for auth
+
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+
+# Tests are broken on Windows, disabled for now
+      # - name: test
+      #   run: yarn lerna -- run test

.github/workflows/master.yml

@@ -1,4 +1,4 @@
-name: Master Build
+name: Main Master Build
 
 on:
   push: