Merge pull request #2291 from spotify/rugvip/sepmic

microsite: remove from workspace and build independently

.github/workflows/e2e-win.yml

@@ -49,6 +49,6 @@ jobs:
 
       - run: yarn tsc
       - name: yarn build
-        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli
       - name: run E2E test
         run: yarn workspace e2e-test start

.github/workflows/e2e.yml

@@ -64,7 +64,7 @@ jobs:
 
       - run: yarn tsc
       - name: yarn build
-        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli --ignore backstage-microsite
+        run: yarn build --ignore example-app --ignore example-backend --ignore @techdocs/cli
       - name: run E2E test
         run: |
           sudo sysctl fs.inotify.max_user_watches=524288

.github/workflows/microsite-build-check.yml

@@ -22,33 +22,17 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      # Beginning of yarn setup, keep in sync between all workflows, see ci.yml
       - 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: cache all node_modules
-        id: cache-modules
-        uses: actions/cache@v2
-        with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('yarn.lock', '**/package.json') }}
-      - name: find location of global yarn cache
-        id: yarn-cache
-        if: steps.cache-modules.outputs.cache-hit != 'true'
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: cache global yarn cache
-        uses: actions/cache@v2
-        if: steps.cache-modules.outputs.cache-hit != 'true'
-        with:
-          path: ${{ steps.yarn-cache.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
+
+        # Skip caching of microsite dependencies, it keeps the global cache size
+        # smaller, which make Windows builds a lot faster for the rest of the project.
       - name: yarn install
         run: yarn install --frozen-lockfile
-      # End of yarn setup
+        working-directory: microsite
 
       - name: build microsite
-        run: yarn workspace backstage-microsite build
+        run: yarn build
+        working-directory: microsite

.github/workflows/microsite-with-storybook-deploy.yml

@@ -54,8 +54,14 @@ jobs:
         run: yarn install --frozen-lockfile
       # End of yarn setup
 
+        # Previous install was to be able to build storybook, this is for the microsite, and we skip caching
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+        working-directory: microsite
+
       - name: build microsite
-        run: yarn workspace backstage-microsite build
+        run: yarn build
+        working-directory: microsite
 
       - name: build storybook
         run: yarn workspace storybook build-storybook

.gitignore

@@ -90,10 +90,6 @@ typings/
 .nuxt
 dist
 
-# Microsite build output
-microsite/build
-microsite/i18n
-
 # Gatsby files
 .cache/
 # Comment in the public line in if your project uses Gatsby and not Next.js

microsite/.gitignore

@@ -0,0 +1,4 @@
+
+# Build output
+build
+i18n

microsite/README.md

@@ -2,12 +2,36 @@ This website was created with [Docusaurus](https://docusaurus.io/).
 
 # What's In This Document
 
-- [Get Started in 5 Minutes](#get-started-in-5-minutes)
+- [Getting Started](#getting-started)
 - [Directory Structure](#directory-structure)
 - [Editing Content](#editing-content)
 - [Adding Content](#adding-content)
 - [Full Documentation](#full-documentation)
 
+# Getting Started
+
+## Installation
+
+```
+$ yarn install
+```
+
+## Local Development
+
+```
+$ yarn start
+```
+
+This command starts a local development server and open up a browser window. Most changes are reflected live without having to restart the server.
+
+## Build
+
+```
+$ yarn build
+```
+
+This command generates static content into the `build` directory, which is what will be deployed to GitHub pages from the master branch.
+
 ## Directory Structure
 
 Your project file structure should look something like this

microsite/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.1-alpha.21",
+  "version": "0.0.0",
   "name": "backstage-microsite",
   "license": "Apache-2.0",
   "private": true,

package.json

@@ -30,8 +30,7 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "plugins/*",
-      "microsite"
+      "plugins/*"
     ]
   },
   "version": "1.0.0",