From aa0e873cdce7581004dbcb1ec0cd3193227b1a5a Mon Sep 17 00:00:00 2001
From: Kalvis Kuskis <44435644+kalvkusk@users.noreply.github.com>
Date: Wed, 28 Feb 2024 18:32:44 +0200
Subject: [PATCH] ci: release workflow update

---
 .github/workflows/build.yaml     |  3 +--
 .github/workflows/lint.yaml      |  1 +
 .github/workflows/release.yaml   | 12 +-----------
 DEVELOPMENT.md                   | 16 ++++++++++++++++
 src-tauri/tauri.conf.canary.json |  4 ++--
 5 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 DEVELOPMENT.md

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index afb50a79..8e906def 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macos-latest ]
+        os: [ windows-latest, macos-11, macos-14 ]
     name: build ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -81,7 +81,6 @@ jobs:
         with:
            workspaces: ./src-tauri
            shared-key: "${{ matrix.os }}"
-           cache-all-crates: true
            cache-on-failure: true
 
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 743ead12..5cfa7bde 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -11,6 +11,7 @@ on:
       - opened
     branches:
       - 'release**'
+      - 'canary**'
       - 'main'
 jobs:
   ts-lint:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ce676d80..6aaa3233 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -2,22 +2,13 @@ name: release
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - '[0-9]+.[0-9]+.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+-rc.[0-9]+'
-      - '[0-9]+.[0-9]+.[0-9]+-canary.[0-9]+'
 
-    branches:
-      - 'canary*'
-      - 'release-[0-9]+.[0-9]+.[0-9]+'
-      - 'ci'
 jobs:
  build-and-publish:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macos-latest ]
+        os: [ windows-latest, macos-11, macos-14]
     name: build ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -66,7 +57,6 @@ jobs:
         with:
            workspaces: ./src-tauri
            shared-key: "${{ matrix.os }}"
-           cache-all-crates: true
            cache-on-failure: true
 
 ########  BUILD  ########
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
new file mode 100644
index 00000000..d6a8721f
--- /dev/null
+++ b/DEVELOPMENT.md
@@ -0,0 +1,16 @@
+# Carpe - Development flow
+
+```mermaid
+graph TD;
+   K[Users report issues in GitHub Issue tracker] --> L[Code Owner assigns issues to contributors]
+    L --> A
+    A[Contributor forks repository in his GitHub Account] --> B[Opens PR to main in https://github.com/0LNetworkCommunity/carpe ] --> C[Automatic CI tests have to pass, Code Owner goes over the code]
+    C --> D[Code Owner merges the PR]
+    D --> E[Code Owner gathers multipe fixes / features]
+    E --> F[Code Owner branches main to canary-vX.X.X branch]
+    F --> G[CI builds and releases Canary binaries and pushes Over-The-Air updates to testers]
+    G --> H[Testers report succesful fixes, features and new issues]
+    G --> L
+    H --> I[Things that passed QA gets cherrypicked from Canary v.X.X.X to release-vX.X.X branch]
+    I --> J[Code owner releases and signs stable release binaries and pushes Over-The-Air updates]
+```
diff --git a/src-tauri/tauri.conf.canary.json b/src-tauri/tauri.conf.canary.json
index 366dbbf0..be6edf7b 100644
--- a/src-tauri/tauri.conf.canary.json
+++ b/src-tauri/tauri.conf.canary.json
@@ -13,7 +13,7 @@
     "updater": {
       "active": true,
       "endpoints": [
-        "https://raw.githubusercontent.com/0LNetworkCommunity/carpe/canary/autoupdater/autoupdater_payload_canary.json"
+        "https://raw.githubusercontent.com/0LNetworkCommunity/carpe/main/autoupdater/autoupdater_payload_canary.json"
       ],
       "dialog": false,
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDk2NDM3QUIwRDdENjkyNjgKUldSb2t0YlhzSHBEbHZOTkNCT3ljZTJESE1yc2t5c1dqbFd0VkZ2THM3N0RucTV0TC9FeDBQb1oK"
@@ -81,4 +81,4 @@
       "csp": "default-src 'self' blob: data: filesystem: ws: http: https: 'unsafe-eval' 'unsafe-inline'"
     }
   }
-}
\ No newline at end of file
+}