From bdaed968bfa8b292033f55005be6f08257f057d7 Mon Sep 17 00:00:00 2001 From: Kalvis Kuskis <44435644+kalvkusk@users.noreply.github.com> Date: Wed, 28 Feb 2024 18:56:28 +0200 Subject: [PATCH] CI: release --- .github/workflows/build.yaml | 2 +- .github/workflows/release.yaml | 2 +- DEVELOPMENT.md | 18 ++++++++++++++++++ src-tauri/tauri.conf.canary.json | 4 ++-- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 DEVELOPMENT.md diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index afb50a79..433da2fa 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, debian-latest ] name: build ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c209b31e..996c2616 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ windows-latest, macos-11, macos-14, ubuntu-latest ] + os: [ windows-latest, macos-11, macos-14, debian-latest ] name: build ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md new file mode 100644 index 00000000..baba1536 --- /dev/null +++ b/DEVELOPMENT.md @@ -0,0 +1,18 @@ +# 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] +``` + +Current code owner: [Kalvinen](https://github.com/kalvkusk) diff --git a/src-tauri/tauri.conf.canary.json b/src-tauri/tauri.conf.canary.json index 366dbbf0..041fb391 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/kalvkusk/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 +}