diff options
Diffstat
| -rw-r--r-- | Taskfile.yml | 45 | +16 −29 |
| -rw-r--r-- | mise.lock | 26 | +5 −21 |
| -rw-r--r-- | mise.toml | 5 | +2 −3 |
3 files changed, 23 insertions, 53 deletions
diff --git a/Taskfile.yml b/Taskfile.yml index dc2d7fc..f803a40 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -201,11 +201,13 @@ tasks: done cp -r "{{.BUILD_DIR}}/agent" "$staging/agent" - if [ "$os" = "windows" ]; then - (cd "$staging" && zip -qr "$OLDPWD/{{.DIST_DIR}}/mirum-${target}.zip" .) - else - tar -czf "{{.DIST_DIR}}/mirum-${target}.tar.gz" -C "$staging" . - fi + format=tar.gz + [ "$os" = "windows" ] && format=zip + mise run package -- \ + --output "{{.DIST_DIR}}" \ + --archive-root "$staging" \ + --archive-name "mirum-${target}" \ + "$format" rm -rf "$staging" - cd {{.DIST_DIR}} && sha256sum *.tar.gz *.zip > SHA256SUMS @@ -231,27 +233,6 @@ tasks: VERSION: "{{.VERSION}}" cmds: - | - cleanup() { rm -rf "$GNUPGHOME" /tmp/mirum-signing.asc /tmp/mirum-apk.rsa 2>/dev/null; } - trap cleanup EXIT - - if [ -n "${GPG_PRIVATE_KEY:-}" ]; then - export GNUPGHOME=$(mktemp -d) - chmod 700 "$GNUPGHOME" - printf '%s' "$GPG_PRIVATE_KEY" > /tmp/mirum-signing.asc - chmod 600 /tmp/mirum-signing.asc - gpg --batch --yes --passphrase "$GPG_PASSPHRASE" --import /tmp/mirum-signing.asc - export GPG_KEY_ID="{{.GPG_KEY_ID}}" - export SIGNING_PRIVATE_KEY="/tmp/mirum-signing.asc" - export NFPM_PASSPHRASE="$GPG_PASSPHRASE" - fi - - if [ -n "${APK_PRIVATE_KEY:-}" ]; then - printf '%s' "$APK_PRIVATE_KEY" > /tmp/mirum-apk.rsa - chmod 600 /tmp/mirum-apk.rsa - export APK_SIGNING_KEY="/tmp/mirum-apk.rsa" - openssl rsa -in /tmp/mirum-apk.rsa -pubout -out "{{.DIST_DIR}}/mirum.rsa.pub" - fi - for arch in {{.LINUX_PKG_TARGETS}}; do mkdir -p {{.BUILD_DIR}}/tmp for cmd in cmd/*/; do @@ -259,12 +240,18 @@ tasks: [ "$bin" = "mirum-agent" ] && continue cp "{{.BUILD_DIR}}/${bin}-linux-${arch}" "{{.BUILD_DIR}}/tmp/${bin}" done - ARCH=$arch nfpm package --packager deb --target {{.DIST_DIR}}/ - ARCH=$arch nfpm package --packager rpm --target {{.DIST_DIR}}/ + + formats="deb rpm" # Alpine does not build for loong64 if [ "$arch" != "loong64" ]; then - ARCH=$arch nfpm package --packager apk --target {{.DIST_DIR}}/ + formats="$formats apk" fi + GPG_KEY_ID="{{.GPG_KEY_ID}}" mise run package -- \ + --version "{{.VERSION}}" \ + --arch "$arch" \ + --output "{{.DIST_DIR}}" \ + --apk-public-key mirum.rsa.pub \ + $formats rm -rf {{.BUILD_DIR}}/tmp done diff --git a/mise.lock b/mise.lock index afea5fa..ea51012 100644 --- a/mise.lock +++ b/mise.lock @@ -33,32 +33,16 @@ url_api = "https://api.github.com/repos/cli/cli/releases/assets/464728543" provenance = "github-attestations" [[tools.go]] -version = "1.26.5" +version = "1.26.6" backend = "core:go" [tools.go."platforms.linux-arm64"] -checksum = "sha256:fe4789e92b1f33358680864bbe8704289e7bb5fc207d80623c308935bd696d49" -url = "https://dl.google.com/go/go1.26.5.linux-arm64.tar.gz" +checksum = "sha256:d0507e9e9d7fe012aae570108cbd76c15de879e17130ab8cb90d4d7445cb1f2e" +url = "https://dl.google.com/go/go1.26.6.linux-arm64.tar.gz" [tools.go."platforms.linux-x64"] -checksum = "sha256:5c2c3b16caefa1d968a94c1daca04a7ca301a496d9b086e17ad77bb81393f053" -url = "https://dl.google.com/go/go1.26.5.linux-amd64.tar.gz" - -[[tools.nfpm]] -version = "2.47.0" -backend = "aqua:goreleaser/nfpm" - -[tools.nfpm."platforms.linux-arm64"] -checksum = "sha256:1c0f5f2999b9a974bfb04fdb0cc3306096de530ac5dbb25d739cc5f5219c919c" -url = "https://github.com/goreleaser/nfpm/releases/download/v2.47.0/nfpm_2.47.0_Linux_arm64.tar.gz" -url_api = "https://api.github.com/repos/goreleaser/nfpm/releases/assets/453316744" -provenance = "cosign" - -[tools.nfpm."platforms.linux-x64"] -checksum = "sha256:0660ca602b2d2d2ae4781a06c692b3eeb9d437ffea05b831d76e41f4a3188783" -url = "https://github.com/goreleaser/nfpm/releases/download/v2.47.0/nfpm_2.47.0_Linux_x86_64.tar.gz" -url_api = "https://api.github.com/repos/goreleaser/nfpm/releases/assets/453316748" -provenance = "cosign" +checksum = "sha256:708effb774be8237570d0add163225abbdfaf4fca28b2611df167beba4feef89" +url = "https://dl.google.com/go/go1.26.6.linux-amd64.tar.gz" [[tools.node]] version = "24.18.0" diff --git a/mise.toml b/mise.toml index e3757c4..1be13f0 100644 --- a/mise.toml +++ b/mise.toml @@ -9,8 +9,7 @@ experimental = true [tools] buf = "1.67.0" gh = "2.96.0" -go = "1.26.5" -nfpm = "2.47.0" +go = "1.26.6" node = "24.18.0" rclone = "1.74.4" task = "3.52.0" # Removed after Taskfile.yml is migrated to mise tasks. @@ -33,5 +32,5 @@ zig = "0.16.0" [task_config] dir = "{{cwd}}" includes = [ - "git::https://github.com/dimidiumlabs/infra.git//tasks?ref=1934f5fb264ab046031d5d1b61227de2e1f8dde9", + "git::https://github.com/dimidiumlabs/infra.git//tasks?ref=9e7330a3e5bde39a87e0ac1b76c9e85db7a6d64a", ] |