From ec2fd0d8715b02ba177d9900f28b7785b7f6e7ce Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Wed, 19 Apr 2023 17:02:22 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=9A=20Fix=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/---new-release.md | 2 +- .github/workflows/flutterWeb.yml | 5 +++-- .github/workflows/flutterWindows.yml | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/---new-release.md b/.github/ISSUE_TEMPLATE/---new-release.md index 526f36a..550d0bf 100644 --- a/.github/ISSUE_TEMPLATE/---new-release.md +++ b/.github/ISSUE_TEMPLATE/---new-release.md @@ -14,7 +14,7 @@ assignees: Khaoz-Topsy - [ ] Create new item in Admin tool - [ ] Copy content of `release_notes.txt` to Markdown - [ ] Future date release date - - [ ] Copy guid, paste into `assistantAppsSettings.dart` + - [ ] Copy guid, paste into `assistant_apps_settings.dart` - [ ] Create Pull Request - [ ] Tag **main** (1.x.x) _This should [queue CodeMagic build](https://codemagic.io/app/641d82730d82a528c46ca76a/settings) automatically_ diff --git a/.github/workflows/flutterWeb.yml b/.github/workflows/flutterWeb.yml index 8b91975..2d6cfaf 100644 --- a/.github/workflows/flutterWeb.yml +++ b/.github/workflows/flutterWeb.yml @@ -7,7 +7,7 @@ permissions: # Allow one concurrent deployment concurrency: - group: 'pages' + group: 'build-web' cancel-in-progress: true on: @@ -15,7 +15,8 @@ on: push: branches: ['main'] tags: - - '*' + - '0.*' + - '1.*' jobs: build: diff --git a/.github/workflows/flutterWindows.yml b/.github/workflows/flutterWindows.yml index 17923ad..43e3cc7 100644 --- a/.github/workflows/flutterWindows.yml +++ b/.github/workflows/flutterWindows.yml @@ -7,7 +7,7 @@ permissions: # Allow one concurrent deployment concurrency: - group: 'pages' + group: 'build-windows' cancel-in-progress: true on: @@ -15,7 +15,8 @@ on: push: branches: ['main'] tags: - - '*' + - '0.*' + - '1.*' jobs: build: From a0c11bd447f69b577b0fe289ea6f4008e24728d7 Mon Sep 17 00:00:00 2001 From: Kurt Lourens Date: Wed, 19 Apr 2023 17:02:59 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=9A=20Fix=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/flutterWeb.yml | 1 - .github/workflows/flutterWindows.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/flutterWeb.yml b/.github/workflows/flutterWeb.yml index 2d6cfaf..b2d693b 100644 --- a/.github/workflows/flutterWeb.yml +++ b/.github/workflows/flutterWeb.yml @@ -13,7 +13,6 @@ concurrency: on: workflow_dispatch: push: - branches: ['main'] tags: - '0.*' - '1.*' diff --git a/.github/workflows/flutterWindows.yml b/.github/workflows/flutterWindows.yml index 43e3cc7..d6a2831 100644 --- a/.github/workflows/flutterWindows.yml +++ b/.github/workflows/flutterWindows.yml @@ -13,7 +13,6 @@ concurrency: on: workflow_dispatch: push: - branches: ['main'] tags: - '0.*' - '1.*'