diff options
| author | Nikolay Govorov <me@govorov.online> | 2026-08-19 23:49:25 +0100 |
|---|---|---|
| committer | Nikolay Govorov <me@govorov.online> | 2026-08-19 23:49:25 +0100 |
| commit | 610401d6483ec501bf41aab67449d02ac114e92a (patch) | |
| tree | 4a3c99784af601f42eec382aa583ee9140e89251 | |
| parent | 863dc78a84d3ed9c4f039bec6f8d01154b6db188 (diff) | |
| download | tar tar.gz tar.bz2 tar.lz tar.xz tar.zst zip | |
Use package script from shared infra
Diffstat
| -rw-r--r-- | .github/workflows/build.yml | 24 | +7 −17 |
| -rw-r--r-- | mise.lock | 16 | +0 −16 |
| -rw-r--r-- | mise.toml | 3 | +1 −2 |
3 files changed, 8 insertions, 35 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 11a2409..1ed155a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,34 +57,24 @@ jobs: run: mise bootstrap --locked --yes --update - uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2 - - name: Import GPG key - uses: crazy-max/ghaction-import-gpg@e89d40939c28e39f97cf32126055eeae86ba74ec #v6.3.0 - with: - passphrase: ${{ secrets.GPG_PASSPHRASE }} - gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }} - - run: cargo clippy --all-targets --all-features --release -- -D warnings - run: cargo build --release - run: cargo test --all-features --release --locked - name: Build packages run: | - export SIGNING_PRIVATE_KEY="/tmp/private.asc" - printf '%s' "$GPG_PRIVATE_KEY" > $SIGNING_PRIVATE_KEY - chmod 600 $SIGNING_PRIVATE_KEY - PKG_VERSION=$(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "recluse") | .version') - export VERSION="${PKG_VERSION}~nightly.$(git log -1 --format=%ct)" - export ARCH=${{ matrix.arch }} + VERSION="${PKG_VERSION}~nightly.$(git log -1 --format=%ct)" - mkdir -p dist/ - for pkg in deb rpm; do - nfpm package --packager $pkg --target dist/ - done + mise run package -- \ + --version "$VERSION" \ + --arch "${{ matrix.arch }}" \ + --output dist \ + deb rpm env: GPG_KEY_ID: ${{ vars.GPG_KEY_ID }} GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - NFPM_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Generate coverage (lcov) run: cargo llvm-cov --all-features --workspace --lcov --output-path coverage.lcov diff --git a/mise.lock b/mise.lock index 7f8fde7..1327083 100644 --- a/mise.lock +++ b/mise.lock @@ -60,22 +60,6 @@ url = "https://github.com/jqlang/jq/releases/download/jq-1.8.2/jq-linux-amd64" url_api = "https://api.github.com/repos/jqlang/jq/releases/assets/453012752" provenance = "github-attestations" -[[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" - [[tools.rclone]] version = "1.74.4" backend = "aqua:rclone/rclone" diff --git a/mise.toml b/mise.toml index 214e32f..e5ac914 100644 --- a/mise.toml +++ b/mise.toml @@ -11,7 +11,6 @@ experimental = true "aqua:taiki-e/cargo-llvm-cov" = "0.8.7" gh = "2.96.0" jq = "1.8.2" -nfpm = "2.47.0" rclone = "1.74.4" rust = { version = "1.97.1", profile = "minimal", components = [ "clippy", @@ -37,5 +36,5 @@ rust = { version = "1.97.1", profile = "minimal", components = [ [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", ] |