Merge branch 'staging'

.github/workflows/build-and-deploy-powerhouse-develop.yaml

@@ -0,0 +1,30 @@
+name: Deploy Connect Powerhouse Develop
+
+on:
+  push:
+    branches: [develop]
+
+env:
+  HUSKY: 0
+
+jobs:
+  build:
+    environment: develop
+    runs-on: ubuntu-latest
+    steps:
+      # Check-out your repository.
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build, Push and Release APP to Heroku. # Your custom step name
+        uses: gonuit/heroku-docker-deploy@v1.3.3
+        with:
+          email: ${{ secrets.HEROKU_EMAIL }}
+          heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
+          heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
+          docker_options: >-
+            --build-arg BASE_PATH=/develop/powerhouse/connect
+            --build-arg VITE_BASE_HREF=/develop/powerhouse/connect/
+            --build-arg VITE_ROUTER_BASENAME=/develop/powerhouse/connect
+            --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/develop/powerhouse/switchboard/d/core-dev
+          process_type: web

.github/workflows/e2e-dev.yml

@@ -0,0 +1,27 @@
+name: End-to-end tests
+
+on:
+  push:
+    branches: [develop]
+  workflow_dispatch:
+jobs:
+  cypress-run:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        containers: [1, 2]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Cypress run
+        uses: cypress-io/github-action@v6
+        with:
+          browser: chrome
+          record: true
+          parallel: true
+          start: npm run dev:web
+          wait-on: 'http://localhost:5173/'
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml → .github/workflows/release.yaml

@@ -1,10 +1,12 @@
 name: Release
 
 on:
-  workflow_dispatch:
+    push:
+        branches: [main, staging, develop]
+    workflow_dispatch:
 
 env:
-  HUSKY: 0
+    HUSKY: 0
 
 jobs:
   release:

.releaserc

@@ -1,9 +1,13 @@
 {
     "branches": [
-        "production",
+        "main",
         {
-            "name": "main",
-            "prerelease": "alpha"
+            "name": "staging",
+            "prerelease": "next"
+        },
+        {
+            "name": "develop",
+            "prerelease": "dev"
         }
     ],
     "plugins": [

Dockerfile

@@ -59,7 +59,7 @@ ENV VITE_HIDE_DOCUMENT_MODEL_SELECTION_SETTINGS=${VITE_HIDE_DOCUMENT_MODEL_SELEC
 WORKDIR /opt/app
 COPY . .
 RUN npm install -g husky vite
-RUN npm install --frozen-lockfile
+RUN npm install --frozen-lockfile --force
 RUN npm run build:web -- --base ${BASE_PATH}
 
 # Production image, copy all the files and run next