[pull] staging from imolorhe:staging

.all-contributorsrc

@@ -1,6 +1,6 @@
 {
   "projectName": "altair",
-  "projectOwner": "imolorhe",
+  "projectOwner": "altair-graphql",
   "repoType": "github",
   "repoHost": "https://github.com",
   "files": [

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: imolorhe # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: altair-graphql # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: # Replace with a single Patreon username
 open_collective: altair # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,7 @@
 
 - [ ] Ran `yarn test-build`
 - [ ] Updated relevant documentations
+- [ ] Updated matching config options in altair-static
 
 ### Changes proposed in this pull request:
 <!-- Describe the changes being introduced in this PR -->

.github/workflows/firebase-hosting-pull-request.yml

@@ -5,6 +5,7 @@ name: Deploy to Firebase Hosting on PR
 'on': pull_request
 jobs:
   build_and_preview:
+    if: github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

.github/workflows/pr-e2e.yml

@@ -0,0 +1,46 @@
+name: PR - e2e testing
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest]
+        node-version: [14.x]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: restore lerna
+      uses: actions/cache@v2
+      with:
+        path: |
+          node_modules
+          */*/node_modules
+        key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+    - run: yarn --frozen-lockfile
+    - uses: browser-actions/setup-chrome@latest
+    - name: Build apps (with retries)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 15
+        max_attempts: 3
+        command: yarn build:ci
+    - name: Update webdriver (with retries)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 15
+        max_attempts: 3
+        command: yarn lerna run --scope altair-app webdriver-update-ci
+    - name: Run headless e2e test
+      uses: GabrielBB/xvfb-action@v1
+      with:
+        run: yarn lerna run --scope altair-app e2e:ci

.github/workflows/pr.yml

@@ -1,4 +1,4 @@
-name: PR
+name: PR - testing
 
 on:
   push:
@@ -11,44 +11,50 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
-        node-version: [12.x]
+        node-version: [14.x]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: yarn global add @angular/cli karma lerna surge
+    - name: restore lerna
+      uses: actions/cache@v2
+      with:
+        path: |
+          node_modules
+          */*/node_modules
+        key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
     - run: yarn --frozen-lockfile
-    - run: yarn build:ci
+    - uses: browser-actions/setup-chrome@latest
+    - name: Build apps (with retries)
+      uses: nick-invision/retry@v2
+      with:
+        timeout_minutes: 15
+        max_attempts: 3
+        command: yarn build:ci
     - name: Run headless test
       uses: GabrielBB/xvfb-action@v1
       with:
         run: yarn test:ci
-    - run: yarn lerna run --scope altair-app webdriver-update-ci;
-    - name: Run headless e2e test
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: yarn lerna run --scope altair-app e2e:ci
-
   # https://github.com/marketplace/actions/deployment-action
-  deploy-surge:
-    runs-on: ubuntu-latest
-    env:
-      SURGE_URL: ${{ github.sha }}-${{ github.repository_owner }}-altair.surge.sh
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12
-    - run: yarn --frozen-lockfile
-    - run: yarn build:ci
-    - name: Deploy to surge.sh
-      uses: dswistowski/surge-sh-action@v1
-      with:
-        domain: '${{ env.SURGE_URL }}'
-        project: './packages/altair-app/dist'
-        login: ${{ secrets.surge_login }}
-        token: ${{ secrets.surge_token }}
+  # deploy-surge:
+  #   runs-on: ubuntu-latest
+  #   env:
+  #     SURGE_URL: ${{ github.sha }}-${{ github.repository_owner }}-altair.surge.sh
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - name: Use Node.js
+  #     uses: actions/setup-node@v1
+  #     with:
+  #       node-version: 12
+  #   - run: yarn --frozen-lockfile
+  #   - run: yarn build:ci
+  #   - name: Deploy to surge.sh
+  #     uses: dswistowski/surge-sh-action@v1
+  #     with:
+  #       domain: '${{ env.SURGE_URL }}'
+  #       project: './packages/altair-app/dist'
+  #       login: ${{ secrets.surge_login }}
+  #       token: ${{ secrets.surge_token }}