diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85c87e8ae1..8a3e19535d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -125,7 +125,9 @@ jobs: shell: bash run: | cabal build --enable-tests - echo "::set-output name=bin_path::$(cabal list-bin simplex-chat)" + path=$(cabal list-bin simplex-chat) + echo "bin_path=$path" >> $GITHUB_OUTPUT + echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - name: Unix upload CLI binary to release if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest' @@ -136,6 +138,16 @@ jobs: asset_name: ${{ matrix.asset_name }} tag: ${{ github.ref }} + - name: Unix update CLI binary hash + if: startsWith(github.ref, 'refs/tags/v') && matrix.os != 'windows-latest' + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + append_body: true + body: | + ${{ steps.unix_cli_build.outputs.bin_hash }} + - name: Setup Java if: startsWith(github.ref, 'refs/tags/v') uses: actions/setup-java@v3 @@ -152,7 +164,9 @@ jobs: scripts/desktop/build-lib-linux.sh cd apps/multiplatform ./gradlew packageDeb - echo "::set-output name=package_path::$(echo $PWD/release/main/deb/simplex_*_amd64.deb)" + path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb) + echo "package_path=$path" >> $GITHUB_OUTPUT + echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - name: Linux make AppImage id: linux_appimage_build @@ -160,7 +174,9 @@ jobs: shell: bash run: | scripts/desktop/make-appimage-linux.sh - echo "::set-output name=appimage_path::$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)" + path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage) + echo "appimage_path=$path" >> $GITHUB_OUTPUT + echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - name: Mac build desktop id: mac_desktop_build @@ -172,7 +188,9 @@ jobs: APPLE_SIMPLEX_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_SIMPLEX_NOTARIZATION_PASSWORD }} run: | scripts/ci/build-desktop-mac.sh - echo "::set-output name=package_path::$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)" + path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg) + echo "package_path=$path" >> $GITHUB_OUTPUT + echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - name: Linux upload desktop package to release if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04') @@ -183,6 +201,16 @@ jobs: asset_name: ${{ matrix.desktop_asset_name }} tag: ${{ github.ref }} + - name: Linux update desktop package hash + if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04') + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + append_body: true + body: | + ${{ steps.linux_desktop_build.outputs.package_hash }} + - name: Linux upload AppImage to release if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04' uses: svenstaro/upload-release-action@v2 @@ -192,6 +220,16 @@ jobs: asset_name: simplex-desktop-x86_64.AppImage tag: ${{ github.ref }} + - name: Linux update AppImage hash + if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-20.04' + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + append_body: true + body: | + ${{ steps.linux_appimage_build.outputs.appimage_hash }} + - name: Mac upload desktop package to release if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest' uses: svenstaro/upload-release-action@v2 @@ -201,6 +239,16 @@ jobs: asset_name: ${{ matrix.desktop_asset_name }} tag: ${{ github.ref }} + - name: Mac update desktop package hash + if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest' + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + append_body: true + body: | + ${{ steps.mac_desktop_build.outputs.package_hash }} + - name: Unix test if: matrix.os != 'windows-latest' timeout-minutes: 30 @@ -221,9 +269,11 @@ jobs: sed -i "s/, unix /--, unix /" simplex-chat.cabal cabal build --enable-tests rm -rf dist-newstyle/src/direct-sq* - echo "::set-output name=bin_path::$(cabal list-bin simplex-chat | tail -n 1)" + path=$(cabal list-bin simplex-chat | tail -n 1) + echo "bin_path=$path" >> $GITHUB_OUTPUT + echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT - - name: Windows upload binary to release + - name: Windows upload CLI binary to release if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest' uses: svenstaro/upload-release-action@v2 with: @@ -232,4 +282,14 @@ jobs: asset_name: ${{ matrix.asset_name }} tag: ${{ github.ref }} + - name: Windows update CLI binary hash + if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest' + uses: softprops/action-gh-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + append_body: true + body: | + ${{ steps.windows_build.outputs.bin_hash }} + # Windows / diff --git a/apps/multiplatform/gradle.properties b/apps/multiplatform/gradle.properties index e7c2870506..e8ca8faa21 100644 --- a/apps/multiplatform/gradle.properties +++ b/apps/multiplatform/gradle.properties @@ -28,8 +28,8 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 android.version_name=5.3-beta.8 android.version_code=150 -desktop.version_name=1.5.0 -desktop.version_code=7 +desktop.version_name=1.6.0 +desktop.version_code=8 kotlin.version=1.8.20 gradle.plugin.version=7.4.2 diff --git a/cabal.project b/cabal.project index 13f36ed75e..47f2f1b2cf 100644 --- a/cabal.project +++ b/cabal.project @@ -9,7 +9,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 81385e39bf5d953ec7f85e6e82014672239c3520 + tag: 3828a9591c095651d3eb12c7b9edf564b21451d4 source-repository-package type: git diff --git a/package.yaml b/package.yaml index 5a7f61e7fc..37936c8436 100644 --- a/package.yaml +++ b/package.yaml @@ -46,7 +46,6 @@ dependencies: - terminal == 0.2.* - text == 2.0.* - time == 1.9.* - - unix == 2.8.1.1 - unliftio == 0.2.* - unliftio-core == 0.2.* - zip == 2.0.* diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 8c0551a08d..b4fb02ef25 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."81385e39bf5d953ec7f85e6e82014672239c3520" = "1mdfi6w0w6zqrlycxcziwl29bvqrq07ing6czax8mf66b656lr21"; + "https://github.com/simplex-chat/simplexmq.git"."3828a9591c095651d3eb12c7b9edf564b21451d4" = "0zw33q9x1ppd64qilw0yvh0h9z0ijchk6qsb2i3gs4n1icj15vp5"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/kazu-yamamoto/http2.git"."b5a1b7200cf5bc7044af34ba325284271f6dff25" = "0dqb50j57an64nf4qcf5vcz4xkd1vzvghvf8bk529c1k30r9nfzb"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "0kiwhvml42g9anw4d2v0zd1fpc790pj9syg5x3ik4l97fnkbbwpp"; diff --git a/simplex-chat.cabal b/simplex-chat.cabal index 5516d8bb3e..d2b64a4e9f 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -178,7 +178,6 @@ library , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -228,7 +227,6 @@ executable simplex-bot , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -278,7 +276,6 @@ executable simplex-bot-advanced , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -330,7 +327,6 @@ executable simplex-broadcast-bot , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -381,7 +377,6 @@ executable simplex-chat , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , websockets ==0.12.* @@ -436,7 +431,6 @@ executable simplex-directory-service , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* @@ -513,7 +507,6 @@ test-suite simplex-chat-test , terminal ==0.2.* , text ==2.0.* , time ==1.9.* - , unix ==2.8.1.1 , unliftio ==0.2.* , unliftio-core ==0.2.* , zip ==2.0.* diff --git a/stack.yaml b/stack.yaml index c10d59a693..f94e67de47 100644 --- a/stack.yaml +++ b/stack.yaml @@ -49,7 +49,7 @@ extra-deps: # - simplexmq-1.0.0@sha256:34b2004728ae396e3ae449cd090ba7410781e2b3cefc59259915f4ca5daa9ea8,8561 # - ../simplexmq - github: simplex-chat/simplexmq - commit: 81385e39bf5d953ec7f85e6e82014672239c3520 + commit: 3828a9591c095651d3eb12c7b9edf564b21451d4 - github: kazu-yamamoto/http2 commit: b5a1b7200cf5bc7044af34ba325284271f6dff25 # - ../direct-sqlcipher