Merge branch 'main' into upx

Author: mondeja

.github/workflows/ci.yml

@@ -56,14 +56,20 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-pc-windows-gnu
           - os: macos-latest # AArch64
+            checksums: sha256,sha512,sha1,md5
           - os: macos-13 # x86_64
+            checksums: sha256,sha512,sha1,md5
           - os: macos-latest
+            checksums: sha256,sha512,sha1,md5
             target: x86_64-apple-darwin
           - os: macos-latest
+            checksums: sha256,sha512,sha1,md5
             target: aarch64-apple-darwin
           - os: macos-latest
+            checksums: sha256,sha512,sha1,md5
             target: universal-apple-darwin
           - os: macos-latest
+            checksums: sha256,sha512,sha1,md5
             target: universal-apple-darwin
             build_tool: cargo
           - os: windows-latest
@@ -86,7 +92,7 @@ jobs:
           bin: test-crate
           target: ${{ matrix.target }}
           build-tool: ${{ matrix.build_tool }}
-          checksum: sha256,sha512,sha1,md5
+          checksum: ${{ matrix.checksums || 'b2,sha256,sha512,sha1,md5' }}
           tar: all
           zip: all
           manifest-path: test-crate/Cargo.toml
@@ -126,3 +132,8 @@ jobs:
           target_dir=$(dirname "${{ steps.upload-rust-binary-action.outputs.tar }}")
           already_packed=$(upx "$target_dir/test-crate" | grep AlreadyPackedException)
           test -n "$already_packed"
+      - name: Check b2 output
+        if: ${{ contains(matrix.checksums || 'b2,sha256,sha512,sha1,md5', 'b2') }}
+        run: |
+          printf 'outputs.b2 should not be empty\n'
+          test -n "${{ steps.upload-rust-binary-action.outputs.b2 }}"

CHANGELOG.md

@@ -10,6 +10,10 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
+## [1.23.0] - 2024-11-11
+
+- Add support for BLAKE2 checksums. ([#89](https://github.com/taiki-e/upload-rust-binary-action/issues/89), thanks @aartoni)
+
 ## [1.22.1] - 2024-10-19
 
 - Fix failure when cross-compiling to Windows on non-Windows. ([#86](https://github.com/taiki-e/upload-rust-binary-action/issues/86))
@@ -180,7 +184,8 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 Initial release
 
-[Unreleased]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.22.1...HEAD
+[Unreleased]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.23.0...HEAD
+[1.23.0]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.22.1...v1.23.0
 [1.22.1]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.22.0...v1.22.1
 [1.22.0]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.21.1...v1.22.0
 [1.21.1]: https://github.com/taiki-e/upload-rust-binary-action/compare/v1.21.0...v1.21.1

README.md

@@ -43,7 +43,7 @@ Currently, this action is basically intended to be used in combination with an a
 | no-default-features | false        | Whether to disable cargo build default features                                              | Boolean | `false`        |
 | tar                 | false        | On which platform to distribute the `.tar.gz` file (all, unix, windows, or none)             | String  | `unix`         |
 | zip                 | false        | On which platform to distribute the `.zip` file (all, unix, windows, or none)                | String  | `windows`      |
-| checksum            | false        | Comma-separated list of algorithms to be used for checksum (sha256, sha512, sha1, or md5)    | String  |                |
+| checksum            | false        | Comma-separated list of algorithms to be used for checksum (b2, sha256, sha512, sha1, or md5).<br>Note: b2 is not available by default on macOS, install `b2sum` to use it. | String  |                |
 | include             | false        | Comma-separated list of additional files to be included to the archive                       | String  |                |
 | asset               | false        | Comma-separated list of additional files to be uploaded separately                           | String  |                |
 | leading-dir         | false        | Whether to create the leading directory in the archive or not                                | Boolean | `false`        |
@@ -70,6 +70,7 @@ Currently, this action is basically intended to be used in combination with an a
 | archive | Archive base name.           |
 | zip     | `.zip` archive file name.    |
 | tar     | `.tar.gz` archive file name. |
+| b2      | BLAKE2 checksum file name.   |
 | sha256  | SHA256 checksum file name.   |
 | sha512  | SHA512 checksum file name.   |
 | sha1    | SHA1 checksum file name.     |

action.yml

@@ -65,7 +65,7 @@ inputs:
     description: Alias for 'build-tool'
     required: false
   checksum:
-    description: Comma-separated list of algorithms to be used for checksum (sha256, sha512, sha1, or md5)
+    description: Comma-separated list of algorithms to be used for checksum (b2, sha256, sha512, sha1, or md5)
     required: false
   token:
     description: >
@@ -123,6 +123,9 @@ outputs:
   tar:
     description: '.tar.gz archive file name'
     value: ${{ steps.upload-rust-binary-action.outputs.tar }}
+  b2:
+    description: 'BLAKE2 checksum file name'
+    value: ${{ steps.upload-rust-binary-action.outputs.b2 }}
   sha256:
     description: 'SHA256 checksum file name'
     value: ${{ steps.upload-rust-binary-action.outputs.sha256 }}

main.sh

@@ -145,8 +145,8 @@ if [[ -n "${checksum}" ]]; then
     while read -rd,; do
         checksums+=("${REPLY}")
         case "${REPLY}" in
-            sha256 | sha512 | sha1 | md5) ;;
-            *) bail "'checksum' input option must be 'sha256', 'sha512', 'sha1', or 'md5': '${REPLY}'" ;;
+            b2 | sha256 | sha512 | sha1 | md5) ;;
+            *) bail "'checksum' input option must be 'b2', 'sha256', 'sha512', 'sha1', or 'md5': '${REPLY}'" ;;
         esac
     done <<<"${checksum},"
 fi
@@ -516,6 +516,9 @@ for checksum in ${checksums[@]+"${checksums[@]}"}; do
         # GitHub-hosted macOS runner does not install GNU Coreutils by default.
         # https://github.com/actions/runner-images/issues/90
         case "${checksum}" in
+            b2)
+                bail "checksum for '${checksum}' requires '${checksum}sum' command; consider installing it"
+                ;;
             sha*)
                 if type -P shasum >/dev/null; then
                     shasum -a "${checksum#sha}" "${assets[@]}" >"${archive}.${checksum}"