Skip to content

Commit

Permalink
Revert "Merge branch 'master' into master" (#1730)
Browse files Browse the repository at this point in the history
This reverts commit ce8d3af, reversing
changes made to 75cfc6b.
  • Loading branch information
binarybaron authored Jul 25, 2024
1 parent ce8d3af commit 2eda247
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
53 changes: 1 addition & 52 deletions .github/workflows/build-release-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
release:
types: [created]

env:
DOCKER_IMAGE_NAME: unstoppableswap/asb

jobs:
build_binaries:
name: Build
Expand Down Expand Up @@ -85,7 +82,7 @@ jobs:
run: target/${{ matrix.target }}/release/${{ matrix.bin }} --help

- id: create-archive-name
shell: python
shell: python # Use python to have a prettier name for the archive on Windows.
run: |
import platform
os_info = platform.uname()
Expand Down Expand Up @@ -125,51 +122,3 @@ jobs:
asset_path: ./${{ steps.create-archive-name.outputs.archive }}
asset_name: ${{ steps.create-archive-name.outputs.archive }}
asset_content_type: application/gzip

build_and_push_docker:
name: Build and Push Docker Image
runs-on: ubuntu-latest
needs: build_binaries
steps:
- name: Checkout code
uses: actions/[email protected]
with:
ref: ${{ github.event.release.target_commitish }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Set Docker tags
id: docker_tags
run: |
if [[ ${{ github.event.release.tag_name }} == "preview" ]]; then
echo "::set-output name=preview::true"
else
echo "::set-output name=preview::false"
fi
- name: Build and push Docker image
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
push: true
tags: |
${{ env.DOCKER_IMAGE_NAME }}:${{ github.event.release.tag_name }}
${{ env.DOCKER_IMAGE_NAME }}:latest
if: steps.docker_tags.outputs.preview == 'false'

- name: Build and push Docker image without latest tag (preview release)
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
push: true
tags: ${{ env.DOCKER_IMAGE_NAME }}:${{ github.event.release.tag_name }}
if: steps.docker_tags.outputs.preview == 'true'
7 changes: 2 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- ASB: The `history` command can now be used while the asb is running.

## [0.13.3] - 2024-07-22
## [0.13.3] - 2024-07-15

- Introduced a cooperative Monero redeem feature for Bob to request from Alice if Bob is punished for not refunding in time. Alice can choose to cooperate but is not obligated to do so. This change is backwards compatible. To attempt recovery, resume a swap in the "Bitcoin punished" state. Success depends on Alice being active and still having a record of the swap. Note that Alice's cooperation is voluntary and recovery is not guaranteed
- CLI: `--change-address` can now be omitted. In that case, any change is refunded to the internal bitcoin wallet.
Expand Down Expand Up @@ -372,10 +372,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/xmr-btc-swap/compare/0.13.3...HEAD
[0.13.3]: https://github.com/UnstoppableSwap/xmr-btc-swap/compare/0.13.3...0.13.3
[0.13.3]: https://github.com/UnstoppableSwap/xmr-btc-swap/compare/0.13.3...0.13.3
[0.13.3]: https://github.com/UnstoppableSwap/xmr-btc-swap/compare/0.13.3...0.13.3
[unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.3...HEAD
[0.13.3]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.2...0.13.3
[0.13.2]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.1...0.13.2
[0.13.1]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.0...0.13.1
Expand Down
18 changes: 0 additions & 18 deletions Dockerfile

This file was deleted.

0 comments on commit 2eda247

Please sign in to comment.