From 82c4b600c87da7f82b2b7f60b198a0ac5a1630cc Mon Sep 17 00:00:00 2001
From: binarybaron <86064887+binarybaron@users.noreply.github.com>
Date: Sun, 17 Nov 2024 12:42:57 +0100
Subject: [PATCH] fix(ci): Use ubuntu-22.04 to build GUI, enable preview
 builds, revert 1.0.0-rc.3 (#185)

* fix(ci): Use ubuntu-22.04 to build GUI

* Revert "Prepare release 1.0.0-rc.3 (#184)"

This reverts commit 6bf90eb28e00bedec042827b0354363e401bba02.
---
 .github/workflows/build-gui-release-binaries.yml | 7 ++++---
 CHANGELOG.md                                     | 5 +----
 Cargo.lock                                       | 4 ++--
 src-tauri/tauri.conf.json                        | 2 +-
 swap/Cargo.toml                                  | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-gui-release-binaries.yml b/.github/workflows/build-gui-release-binaries.yml
index 7ec904b5e..c7d6815d2 100644
--- a/.github/workflows/build-gui-release-binaries.yml
+++ b/.github/workflows/build-gui-release-binaries.yml
@@ -9,7 +9,8 @@ jobs:
   publish-tauri:
     # Do not publish preview releases to Github.
     # Building takes too long for preview releases.
-    if: ${{ !contains(github.ref_name, 'preview') }}
+    # TODO: This has been temporarily enabled
+    # if: ${{ !contains(github.ref_name, 'preview') }}
     permissions:
       contents: write
     strategy:
@@ -20,7 +21,7 @@ jobs:
             args: "--target aarch64-apple-darwin"
           - platform: "macos-13" # for Intel based macs.
             args: "--target x86_64-apple-darwin"
-          - platform: "ubuntu-22.04"
+          - platform: "ubuntu-24.04"
             args: ""
           - platform: "windows-latest"
             args: ""
@@ -43,7 +44,7 @@ jobs:
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
       - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+        if: matrix.platform == 'ubuntu-24.04' # This must match the platform value defined above.
         run: |
           sudo apt update;
           sudo apt install -y \
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5fca7e86..fa23f88e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.0-rc.3] - 2024-11-17
-
 - ASB: We now log verbose messages to hourly rotating `tracing*.log` which are kept for 24 hours. General logs are written to `swap-all.log`.
 
 ## [1.0.0-rc.2] - 2024-11-16
@@ -399,8 +397,7 @@ It is possible to migrate critical data from the old db to the sqlite but there
 - Fixed an issue where Alice would not verify if Bob's Bitcoin lock transaction is semantically correct, i.e. pays the agreed upon amount to an output owned by both of them.
   Fixing this required a **breaking change** on the network layer and hence old versions are not compatible with this version.
 
-[unreleased]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.3...HEAD
-[1.0.0-rc.3]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.2...1.0.0-rc.3
+[unreleased]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.2...HEAD
 [1.0.0-rc.2]: https://github.com/UnstoppableSwap/core/compare/1.0.0-rc.1...1.0.0-rc.2
 [1.0.0-rc.1]: https://github.com/UnstoppableSwap/core/compare/1.0.0-alpha.3...1.0.0-rc.1
 [1.0.0-alpha.3]: https://github.com/UnstoppableSwap/core/compare/1.0.0-alpha.2...1.0.0-alpha.3
diff --git a/Cargo.lock b/Cargo.lock
index df88d8aa5..64f4fcbc9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7937,7 +7937,7 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
 [[package]]
 name = "swap"
-version = "1.0.0-rc.3"
+version = "1.0.0-rc.2"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -9504,7 +9504,7 @@ dependencies = [
 
 [[package]]
 name = "unstoppableswap-gui-rs"
-version = "1.0.0-rc.3"
+version = "0.7.0"
 dependencies = [
  "anyhow",
  "once_cell",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 284665edd..fbdf75e1d 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,6 +1,6 @@
 {
   "productName": "UnstoppableSwap",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.2",
   "identifier": "net.unstoppableswap.gui",
   "build": {
     "devUrl": "http://localhost:1420",
diff --git a/swap/Cargo.toml b/swap/Cargo.toml
index b1d65536f..c703db4e3 100644
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swap"
-version = "1.0.0-rc.3"
+version = "1.0.0-rc.2"
 authors = [ "The COMIT guys <hello@comit.network>" ]
 edition = "2021"
 description = "XMR/BTC trustless atomic swaps."