Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 8 additions & 26 deletions .github/workflows/release-canary.yml
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to add !fromJson(needs.plan.outputs.val).announcement_is_prerelease here like we do with release.yml?

Copy link
Copy Markdown
Contributor Author

@viadezo1er Cedric / ViaDézo1er (viadezo1er) Apr 30, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather I forgot to remove code signing for canary release (don't see the point of signing the canary release, considering the amount of bugs we often have in them and our current shipping speed)

Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ jobs:
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json
HAS_SSLDOTCOM_SIGNING: ${{ secrets.SSLDOTCOM_USERNAME != '' && secrets.SSLDOTCOM_PASSWORD != '' && secrets.SSLDOTCOM_CREDENTIAL_ID != '' && secrets.SSLDOTCOM_TOTP_SECRET != '' }}
steps:
- name: Enable windows longpaths
run: git config --global core.longpaths true
Expand All @@ -140,6 +139,14 @@ jobs:
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
fi

- name: Install sha256sum (macOS ARM64)
if: ${{ runner.os == 'macOS' && runner.arch == 'ARM64' }}
shell: bash
run: |
printf '#!/bin/sh\nexec shasum -a 256 "$@"\n' > /tmp/sha256sum
chmod +x /tmp/sha256sum
echo /tmp >> "$GITHUB_PATH"

- name: Install dist
run: ${{ matrix.install_dist.run }}

Expand All @@ -153,31 +160,6 @@ jobs:
- name: Install dependencies
run: ${{ matrix.packages_install }}

- name: Configure SSL.com signing env
if: ${{ runner.os == 'Windows' && env.HAS_SSLDOTCOM_SIGNING == 'true' }}
shell: bash
env:
SSLDOTCOM_USERNAME: ${{ secrets.SSLDOTCOM_USERNAME }}
SSLDOTCOM_PASSWORD: ${{ secrets.SSLDOTCOM_PASSWORD }}
SSLDOTCOM_CREDENTIAL_ID: ${{ secrets.SSLDOTCOM_CREDENTIAL_ID }}
SSLDOTCOM_TOTP_SECRET: ${{ secrets.SSLDOTCOM_TOTP_SECRET }}
run: |
write_github_env() {
local key="$1"
local value="$2"
local delimiter="EOF_${key}_$$"
{
echo "${key}<<${delimiter}"
echo "${value}"
echo "${delimiter}"
} >> "$GITHUB_ENV"
}

write_github_env "SSLDOTCOM_USERNAME" "$SSLDOTCOM_USERNAME"
write_github_env "SSLDOTCOM_PASSWORD" "$SSLDOTCOM_PASSWORD"
write_github_env "SSLDOTCOM_CREDENTIAL_ID" "$SSLDOTCOM_CREDENTIAL_ID"
write_github_env "SSLDOTCOM_TOTP_SECRET" "$SSLDOTCOM_TOTP_SECRET"

- name: Build artifacts
shell: bash
run: |
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ jobs:
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
fi

- name: Install sha256sum (macOS ARM64)
if: ${{ runner.os == 'macOS' && runner.arch == 'ARM64' }}
shell: bash
run: |
printf '#!/bin/sh\nexec shasum -a 256 "$@"\n' > /tmp/sha256sum
chmod +x /tmp/sha256sum
echo /tmp >> "$GITHUB_PATH"

- name: Install dist
run: ${{ matrix.install_dist.run }}

Expand All @@ -139,7 +147,7 @@ jobs:
run: ${{ matrix.packages_install }}

- name: Configure SSL.com signing env
if: ${{ runner.os == 'Windows' && env.HAS_SSLDOTCOM_SIGNING == 'true' }}
if: ${{ runner.os == 'Windows' && env.HAS_SSLDOTCOM_SIGNING == 'true' && !fromJson(needs.plan.outputs.val).announcement_is_prerelease }}
shell: bash
env:
SSLDOTCOM_USERNAME: ${{ secrets.SSLDOTCOM_USERNAME }}
Expand Down
15 changes: 8 additions & 7 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ members = ["cargo:."]

# Config for 'dist'
[dist]
# Skip checking whether the specified configuration files are up to date
allow-dirty = ["ci"]
# The preferred dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.31.0"
# CI backends to support
Expand All @@ -11,21 +13,20 @@ ci = "github"
create-release = true
# Which actions to run on pull requests
pr-run-mode = "plan"
# Skip checking whether the specified configuration files are up to date
allow-dirty = ["ci"]
ssldotcom-windows-sign = "test"
# The installers to generate for each app
installers = ["shell", "powershell", "homebrew"]
homepage = "https://github.com/braintrustdata/bt"
# Target platforms to build apps for (Rust target-triple syntax)
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-pc-windows-msvc", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl", "x86_64-pc-windows-msvc"]
# Path that installers should place binaries in
install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
# The archive format to use for non-windows builds (defaults .tar.xz)
unix-archive = ".tar.gz"
# The archive format to use for windows builds (defaults .zip)
windows-archive = ".zip"
# Path that installers should place binaries in
install-path = ["$XDG_BIN_HOME/", "$XDG_DATA_HOME/../bin", "~/.local/bin"]
# Whether to install an updater program
install-updater = true
Comment on lines 25 to -29
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does removing this break the self update command?

Copy link
Copy Markdown
Contributor Author

@viadezo1er Cedric / ViaDézo1er (viadezo1er) Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, This standalone program will be installed as the name yourpackage-update so it removes bt-update. bt self update is defined in src/self_update.rs.

Copy link
Copy Markdown
Contributor Author

@viadezo1er Cedric / ViaDézo1er (viadezo1er) Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And install path still exists in dist-workspace.toml

# Custom message to display on successful install
install-success-msg = ""

[dist.github-custom-runners]
aarch64-pc-windows-msvc = "windows-11-arm"
Loading