From 24c0b0e4b8ed8c14224bd0e2da987465fe68ac7a Mon Sep 17 00:00:00 2001
From: Lucas Rodriguez <lucas@fleetdm.com>
Date: Fri, 20 Sep 2024 18:09:35 -0300
Subject: [PATCH 1/2] Release fleetd 1.33.0

---
 .github/workflows/generate-desktop-targets.yml          | 2 +-
 orbit/CHANGELOG.md                                      | 6 ++++++
 orbit/changes/20320-uninstall-after-failed-post-install | 1 -
 orbit/changes/update-go1.23.1                           | 2 --
 4 files changed, 7 insertions(+), 4 deletions(-)
 delete mode 100644 orbit/changes/20320-uninstall-after-failed-post-install
 delete mode 100644 orbit/changes/update-go1.23.1

diff --git a/.github/workflows/generate-desktop-targets.yml b/.github/workflows/generate-desktop-targets.yml
index d7324c9bf0ba..ebb6abd050cf 100644
--- a/.github/workflows/generate-desktop-targets.yml
+++ b/.github/workflows/generate-desktop-targets.yml
@@ -24,7 +24,7 @@ defaults:
     shell: bash
 
 env:
-  FLEET_DESKTOP_VERSION: 1.32.0
+  FLEET_DESKTOP_VERSION: 1.33.0
 
 permissions:
   contents: read
diff --git a/orbit/CHANGELOG.md b/orbit/CHANGELOG.md
index 1d11365182eb..400b8b3b6a62 100644
--- a/orbit/CHANGELOG.md
+++ b/orbit/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Orbit 1.33.0 (Sep 20, 2024)
+
+During software install flow, if installer's post-install script fails, run the uninstall script to attempt to roll back.
+
+* Updated Go to go1.23.1
+
 ## Orbit 1.32.0 (Aug 29, 2024)
 
 * Bumped macadmins extension to use SOFA feed sofafeed.macadmins.io
diff --git a/orbit/changes/20320-uninstall-after-failed-post-install b/orbit/changes/20320-uninstall-after-failed-post-install
deleted file mode 100644
index 5dd4d969729e..000000000000
--- a/orbit/changes/20320-uninstall-after-failed-post-install
+++ /dev/null
@@ -1 +0,0 @@
-During software install flow, if installer's post-install script fails, run the uninstall script to attempt to roll back.
diff --git a/orbit/changes/update-go1.23.1 b/orbit/changes/update-go1.23.1
deleted file mode 100644
index d9a689e4e905..000000000000
--- a/orbit/changes/update-go1.23.1
+++ /dev/null
@@ -1,2 +0,0 @@
-* Updated Go to go1.23.1
-

From 02509a0c4df762ec15065b1a8eb5544b0a582fec Mon Sep 17 00:00:00 2001
From: Lucas Rodriguez <lucas@fleetdm.com>
Date: Fri, 20 Sep 2024 19:03:28 -0300
Subject: [PATCH 2/2] Push fixes to docs and workflow

---
 .github/workflows/generate-desktop-targets.yml | 5 -----
 .github/workflows/goreleaser-orbit.yaml        | 5 -----
 orbit/CHANGELOG.md                             | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/generate-desktop-targets.yml b/.github/workflows/generate-desktop-targets.yml
index ebb6abd050cf..93e5a30fcec3 100644
--- a/.github/workflows/generate-desktop-targets.yml
+++ b/.github/workflows/generate-desktop-targets.yml
@@ -13,11 +13,6 @@ on:
       - '.github/workflows/generate-desktop-targets.yml'
   workflow_dispatch:
 
-# This allows a subsequently queued workflow run to interrupt previous runs
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id}}
-  cancel-in-progress: true
-
 defaults:
   run:
     # fail-fast using bash -eo pipefail. See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
diff --git a/.github/workflows/goreleaser-orbit.yaml b/.github/workflows/goreleaser-orbit.yaml
index 54e16752b335..e196901ead56 100644
--- a/.github/workflows/goreleaser-orbit.yaml
+++ b/.github/workflows/goreleaser-orbit.yaml
@@ -5,11 +5,6 @@ on:
     tags:
       - "orbit-*" # For testing, use a pre-release tag like 'orbit-1.24.0-1'
 
-# This allows a subsequently queued workflow run to interrupt previous runs
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id}}
-  cancel-in-progress: true
-
 defaults:
   run:
     # fail-fast using bash -eo pipefail. See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#exit-codes-and-error-action-preference
diff --git a/orbit/CHANGELOG.md b/orbit/CHANGELOG.md
index 400b8b3b6a62..fa9efe36efeb 100644
--- a/orbit/CHANGELOG.md
+++ b/orbit/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Orbit 1.33.0 (Sep 20, 2024)
 
-During software install flow, if installer's post-install script fails, run the uninstall script to attempt to roll back.
+* Added support to run the configured uninstall script when installer's post-install script fails.
 
 * Updated Go to go1.23.1