Skip to content

Commit

Permalink
fix(ci): Use ubuntu-22.04 to build GUI, enable preview builds, revert…
Browse files Browse the repository at this point in the history
… 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 6bf90eb.
  • Loading branch information
binarybaron authored Nov 17, 2024
1 parent 6bf90eb commit 82c4b60
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 11 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-gui-release-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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: ""
Expand All @@ -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 \
Expand Down
5 changes: 1 addition & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion swap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "swap"
version = "1.0.0-rc.3"
version = "1.0.0-rc.2"
authors = [ "The COMIT guys <[email protected]>" ]
edition = "2021"
description = "XMR/BTC trustless atomic swaps."
Expand Down

0 comments on commit 82c4b60

Please sign in to comment.