tidying up

.github/workflows/build-branch.yaml

@@ -2,16 +2,16 @@ name: Build (Branch)
 on:
   push:
     branches:
-      # TODO RC - uncomment
+      # TODO RC
       # - master
       # - 'release-*'
-      - richard-drone-ui-sjdkfldsgfdsf
+      - richard-drone-ui
 jobs:
-  # test:
-  #   uses: ./.github/workflows/test.yaml
-  build-and-upload:
+  test:
+    uses: ./.github/workflows/test.yaml
+  build-branch-and-upload:
     uses: ./.github/workflows/build-and-upload.yaml
-    # needs: test
+    needs: test
     permissions:
       contents: 'read'
       id-token: 'write'

.github/workflows/build-release.yaml

@@ -2,17 +2,16 @@ name: Build (Release)
 on:
   push:
     tags:
-      # TODO: RC
-      - richard-drone-ui-v*
-env:
-  ENVIRONMENT: production
+      # TODO RC
+      # - v*
+      - v1.2.3-richard-drone-ui
 
 jobs:
-  # test:
-  #   uses: ./.github/workflows/test.yaml
-  build-and-upload:
+  test:
+    uses: ./.github/workflows/test.yaml
+  build-tag-and-upload:
     uses: ./.github/workflows/build-and-upload.yaml
-    # needs: test
+    needs: test
     permissions:
       contents: 'read'
       id-token: 'write'

.github/workflows/test.yaml

@@ -9,13 +9,6 @@ on:
       - master
       - 'release-*'
   workflow_call:
-    # inputs:
-    #   config-path:
-    #     required: true
-    #     type: string
-    # secrets:
-    #   envPAT:
-    #     required: true
 
 jobs:
   unit-test:

package.json

@@ -1,7 +1,6 @@
 {
   "name": "ui",
-  "version": "richard-drone-ui",
-  "TODO RC": "fix above",
+  "version": "master-dev",
   "private": true,
   "repository": "https://github.com/rancher/ui",
   "license": "Apache-2.0",