merge from origin/main

Author: gavinbarron

.github/workflows/pr-chat.yml

@@ -34,8 +34,7 @@ jobs:
         shell: bash
         run: |
           cp samples/react-contoso/.env.sample samples/react-contoso/.env
-          sed -i 's|REACT_APP_CLIENT_ID="00000000-0000-0000-0000-000000000000"|REACT_APP_CLIENT_ID="${{secrets.REACT_CONTOSO_CHAT}}"|g' samples/react-contoso/.env
-          sed -i 's|REACT_APP_BACKEND_CLIENT_ID="00000000-0000-0000-0000-000000000000"|REACT_APP_BACKEND_CLIENT_ID="${{secrets.REACT_CONTOSO_CHAT_BACKEND}}"|g' samples/react-contoso/.env
+          sed -i 's|REACT_APP_CLIENT_ID="ed072e38-e76e-45ae-ab76-073cb95495bb"|REACT_APP_CLIENT_ID="${{secrets.REACT_CONTOSO_CHAT}}"|g' samples/react-contoso/.env
           sed -i 's|REACT_APP_BASE_DIR="/"|REACT_APP_BASE_DIR="/next/mgt-chat"|g' samples/react-contoso/.env
 
       - name: Build 🛠

.github/workflows/pr-clean-storybook.yml renamed to .github/workflows/pr-clean-deployments.yml

@@ -1,7 +1,7 @@
 # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
 
-name: Clean pr storybook
+name: Clean pr deployments
 
 on:
   pull_request:
@@ -30,5 +30,29 @@ jobs:
           git config user.name github-actions
           git config user.email [email protected]
           git rm -r next/pr/${{ github.event.number }}
-          git commit -m "PR ${{ github.event.number }} closed"
+          git commit -m "PR ${{ github.event.number }} closed - remove storybook"
+          git push
+
+  react-contoso:
+    if: "contains(github.event.pull_request.labels.*.name, 'Build: React Contoso')"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          ref: gh-pages
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: 'https://registry.npmjs.org'
+      - run: |
+          git config user.name github-actions
+          git config user.email [email protected]
+          git rm -r next/sample/pr/${{ github.event.number }}
+          git commit -m "PR ${{ github.event.number }} closed - remove react-contoso"
           git push

.github/workflows/pr-storybook.yml

@@ -59,5 +59,5 @@ jobs:
       - name: Comment PR
         uses: thollander/actions-comment-pull-request@v1
         with:
-          message: 'The updated storybook is available [here](https://mgt.dev/next/pr/${{ github.event.number }})'
+          message: '📖 The updated storybook is available [here](https://mgt.dev/next/pr/${{ github.event.number }})'
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-test-app.yml

@@ -0,0 +1,56 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Deploy react-contoso sample app for PR
+
+on:
+  pull_request:
+    types: [opened, labeled, synchronize, reopened]
+    branches: [main, release/**, next/**]
+
+jobs:
+  react-contoso:
+    if: "contains(github.event.pull_request.labels.*.name, 'Build: React Contoso')"
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install deps 🛠
+        run: |
+          echo "installing deps for packages"
+          yarn
+
+      - name: Setup env file
+        shell: bash
+        run: |
+          cp samples/react-contoso/.env.sample samples/react-contoso/.env
+          sed -i 's|REACT_APP_CLIENT_ID="ed072e38-e76e-45ae-ab76-073cb95495bb"|REACT_APP_CLIENT_ID="${{secrets.REACT_CONTOSO_CHAT}}"|g' samples/react-contoso/.env
+          sed -i 's|REACT_APP_BASE_DIR="/"|REACT_APP_BASE_DIR="/next/sample/pr/${{ github.event.number }}"|g' samples/react-contoso/.env
+
+      - name: Build 🛠
+        run: |
+          yarn build
+          yarn build:react-contoso
+
+      - name: Deploy mgt.dev/sample/pr/${{ github.event.number }} 🚀
+        uses: JamesIves/[email protected]
+        with:
+          branch: gh-pages
+          folder: samples/react-contoso/build
+          target-folder: next/sample/pr/${{ github.event.number }}
+
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v1
+        with:
+          message: '🚀 New react-contoso sample application deployed [here](https://mgt.dev/next/sample/pr/${{ github.event.number }})'
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/storybook.yml

@@ -41,6 +41,7 @@ jobs:
           folder: storybook-static
           target-folder: next
           clean-exclude: |
+            sample
             pr
             v3
             mgt-chat