From 3fa9f00412a0e8307d17f7a5d99b83672c335463 Mon Sep 17 00:00:00 2001
From: Peter Makowski <peter.makowski@canonical.com>
Date: Tue, 18 Jun 2024 16:40:05 +0200
Subject: [PATCH] chore: update upload workflow to trigger on push to main and
 3.* branches - replace dotrun with build in the test workflow

Signed-off-by: Peter Makowski <peter.makowski@canonical.com>
---
 .github/workflows/test.yml   | 47 +++++++++++++++++++++++-------------
 .github/workflows/upload.yml |  8 +++---
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fef8b30008..109b3ad48c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Restore node_modules
         id: yarn-cache
         uses: actions/cache@v3
@@ -22,7 +22,7 @@ jobs:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install
@@ -35,17 +35,17 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
     steps:
       - uses: actions/checkout@v3
       - name: Restore node_modules
         id: yarn-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install
@@ -53,18 +53,31 @@ jobs:
         run: CYPRESS_INSTALL_BINARY=0 yarn install
       - run: yarn test:ci
 
-  run-dotrun:
+  build:
+    name: Build
     timeout-minutes: 15
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        node-version: [20.x]
     steps:
-      - uses: actions/checkout@v2
-      - name: Install dotrun
-        uses: canonical/install-dotrun@main
-      - name: Install dependencies
-        run: dotrun install
+      - uses: actions/checkout@v4
+      - name: Restore node_modules
+        id: yarn-cache
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Install
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: CYPRESS_INSTALL_BINARY=0 yarn install
       - name: Build assets
-        run: dotrun --env CI=false build
-      - name: Run dotrun
-        run: dotrun &
-      - name: Wait for MAAS UI to be ready
-        run: dotrun wait-on-ui
+        run: yarn build
+      - name: Serve build
+        run: yarn serve --host --port=8400 --base=/ &
+      - name: Wait for UI to be ready
+        run: yarn wait-on-ui
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
index c304fb18ad..82049c00ad 100644
--- a/.github/workflows/upload.yml
+++ b/.github/workflows/upload.yml
@@ -1,10 +1,12 @@
 name: Build upload
 on:
-  pull_request_target:
-    types: [closed]
+  push:
+    branches:
+      - main
+      - "3.*"
 jobs:
   upload-build:
-    if: github.event.pull_request.merged == true
+    if: github.repository_owner == 'canonical'
     name: Upload build artifacts
     runs-on: ubuntu-22.04
     env: