From 39b6ecaa97dd0cf02fbfacee1722ea38c96b172f Mon Sep 17 00:00:00 2001 From: binarybaron Date: Fri, 26 Jul 2024 14:42:52 +0200 Subject: [PATCH] Prepare release 0.13.4 --- .DS_Store | Bin 0 -> 8196 bytes .github/workflows/build-release-binaries.yml | 53 ++++++++++++++++++- CHANGELOG.md | 3 +- Dockerfile | 18 +++++++ utils/.DS_Store | Bin 0 -> 6148 bytes 5 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 .DS_Store create mode 100644 Dockerfile create mode 100644 utils/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dbdd3877f9bda120df25f221f3512839b337fbf4 GIT binary patch literal 8196 zcmeI1O=uHA6vyADNxQWw5foYvx>8VtXp^>tLJ?z3(W-@FN{h78e42(PyCIu2LM=oT zJSZN$c=1s2Dqci9c+h(4!HZr5QK<*g38lq}?w2l&ZK*M5qZWBln2U8$% z8TYA=GCUbBUp=Jo>w@P}C7St#x~?~@?rz9pT^-Lu9_=x_I@oW7eK+e^U_7u{Jmp*K z?VtK(YqVhv%DmMa;W(g-Sg@n+IP#E#xS%DRxZ5g@a<2|nxtoqjc{hs{IU|g7R~=^w z_0Hg5Qk)U+#H?)`O_@IrRhc&!pOSAaL*&;OzZ0(u#+(zh-T8Kv`Y7AaOa93-mHCV3 zQj%tVp|1NetJ@9*K6{HwIXvt4Zq@r~{qql_V=wLc!WfjHRSe;9^u3QT4j0az1)RAu zV8%*jj^8Do#d4XnS@3$_DULR$tGz?*P`lL2;W?ueE<_7OGZ@WJvu_iIk%?74M`M%e zWNFsD_q3rGqG>&uw-VBcB!dphxq02bMhA zqR;2|do=%$cWJ3p-PhYUd~tR@lhuvej2WL472D$FC$>BIl^l|AQsMA5(Mx4DzF(jD zdW28KRY|C*%_E4UIQTfDA@vu+c|Bw3DeSEfvxsf9HaoYQt^Y?_zyIGx1(_-pkP7_m z3MkG{I21(6R`Uv5YiqbgaAS?dm2GRK;Esi`ekZrpe;8t)#`^-?mTik3Y=8VkK<#;s WJYUesS>FGt8uI?nA8G!v`~Pp)Wr8pO literal 0 HcmV?d00001 diff --git a/.github/workflows/build-release-binaries.yml b/.github/workflows/build-release-binaries.yml index 662e3a5e7..4f466adae 100644 --- a/.github/workflows/build-release-binaries.yml +++ b/.github/workflows/build-release-binaries.yml @@ -4,6 +4,9 @@ on: release: types: [created] +env: + DOCKER_IMAGE_NAME: unstoppableswap/asb + jobs: build_binaries: name: Build @@ -82,7 +85,7 @@ jobs: run: target/${{ matrix.target }}/release/${{ matrix.bin }} --help - id: create-archive-name - shell: python # Use python to have a prettier name for the archive on Windows. + shell: python run: | import platform os_info = platform.uname() @@ -122,3 +125,51 @@ 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/checkout@v4.1.7 + 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' diff --git a/CHANGELOG.md b/CHANGELOG.md index 7127c424c..bb8e53e63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -375,8 +375,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.4...HEAD -[0.13.4]: https://github.com/UnstoppableSwap/xmr-btc-swap/compare/0.13.4...0.13.4 +[unreleased]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.4...HEAD [0.13.4]: https://github.com/comit-network/xmr-btc-swap/compare/0.13.3...0.13.4 [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 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..2dbf53975 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM rust:1.59-slim AS builder + +WORKDIR /build + +RUN apt-get update +RUN apt-get install -y git clang cmake libsnappy-dev + +COPY . . + +RUN cargo build --release --bin=asb + +FROM debian:bullseye-slim + +WORKDIR /data + +COPY --from=builder /build/target/release/asb /bin/asb + +ENTRYPOINT ["asb"] diff --git a/utils/.DS_Store b/utils/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..13fec8208c2315e6090c7053c368aff55e9ed527 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8-BN@c6!f;>wO~r62wp<1FJMFuDm9^{24l7~sYOa5cYPsW#OHBl zcO#Z4coMNQF#FBUPnP`>cCw5y-kS~Ej5&-k0g6~@!0?4&9JM4B>p|rD8TV|&o>&^r z(@80t9Dk7ke0PG4*#vaJKE1y%Rw2Y*!$};and`psO0~AJSr>KD6gU2zn)_Lh&C*^l zy~5eKQgK+=L3k03<^yN@L?u}eC8Mb>h=wCbxxS2&p_=#9EE%S{);9ss5RHMew^(%C z!Mhp-G|B3-#>-+s4Y{~Z4(&n(&O3+(S6wJ#Few2WrTQTHfE8Ydw Z0)B}Gpl2~R2p$mn5zsWyKn(mU1MgY4O-ld( literal 0 HcmV?d00001