Merge branch 'feature/cicd' into development

setoelkahfi · setoelkahfi · commit cb84d10d9287 · 2026-04-06T16:19:49.000+02:00
diff --git a/.agents/skills/ci-cd/SKILL.md b/.agents/skills/ci-cd/SKILL.md
@@ -622,6 +622,9 @@ When the main `README.MD` changes its tagline, logo URL, quick start commands, o
 **Platform support table missing new targets**
 When a new platform is added to any release matrix (e.g. `linux-arm64`), update the platform support table in `npm/smbcloud-cli/README.md` and `pypi/README.md` in the same PR.
 
+**PyPI blocks short and protocol-reserved package names**
+PyPI maintains a blocklist of names that are too generic or conflict with well-known protocols and tools. `smb` is blocked because it is the name of the Windows SMB/CIFS file sharing protocol. Attempting to publish a package named `smb` returns `400 The name 'smb' isn't allowed`. There is no workaround — the name cannot be registered regardless of who owns it. If you need `uvx <name>` to work without `--from`, the package name and binary name must match AND the package name must not be on the blocklist. For this repo, `uvx --from smbcloud-cli smb` is the correct form.
+
 **`on: release: types: [published]` does not fire when the release is created by automation**
 When `softprops/action-gh-release` (or any action) creates a GitHub Release using the implicit `GITHUB_TOKEN`, GitHub does not dispatch the `release` event to other workflows. The downstream workflow simply never runs — no error, no log entry. Use `workflow_dispatch` via `actions/github-script@v7` to chain workflows explicitly, and add `actions: write` to the upstream workflow's `permissions`.
 
diff --git a/.agents/skills/smbcloud-cli-release/SKILL.md b/.agents/skills/smbcloud-cli-release/SKILL.md
@@ -132,6 +132,29 @@ Or publish in one step:
 
 For local uploads, export `MATURIN_PYPI_TOKEN` before running `maturin upload` or `maturin publish`.
 
+### Publishing the smb stub (one-time)
+
+The stub lives in `pypi/smb-stub/` and is built with `hatchling`, not `maturin`. It only needs to be published once — it never changes.
+
+```sh
+cd pypi/smb-stub
+pip install hatchling build twine
+python -m build
+twine upload dist/*
+```
+
+Or with uv:
+
+```sh
+cd pypi/smb-stub
+uv run --with build python -m build
+uv run --with twine twine upload dist/*
+```
+
+Use a PyPI API token with upload scope for `smb`. Trusted publishing is not required for a static stub.
+
+Do not republish the stub on every CLI release. It permanently depends on the unpinned `smbcloud-cli`, so uv always resolves the latest version when the tool environment is created or upgraded.
+
 ### Local publishing constraint
 
 A local publish normally builds only for the current platform.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,10 +21,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@stable
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secret
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - run: cargo test --all-features
diff --git a/.github/workflows/release-crate.yml b/.github/workflows/release-crate.yml
@@ -68,11 +68,8 @@ jobs:
         with:
           key: publish
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secret
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - name: Verify Cargo.toml version matches tag
         shell: bash
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -86,11 +86,8 @@ jobs:
         with:
           key: github-${{ matrix.target }}
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secrets
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - name: Build binary
         shell: bash
diff --git a/.github/workflows/release-homebrew.yml b/.github/workflows/release-homebrew.yml
@@ -52,7 +52,7 @@ jobs:
           echo "AMD64 SHA256: ${AMD64_SHA}"
 
       - name: Checkout Homebrew tap
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: smbcloudXYZ/homebrew-tap
           token: ${{ secrets.HOMEBREW_TAP_TOKEN }}
diff --git a/.github/workflows/release-npm.yml b/.github/workflows/release-npm.yml
@@ -102,11 +102,8 @@ jobs:
           rustup target add ${{ matrix.build.TARGET }} --toolchain ${{ env.RUST_TOOLCHAIN }}
           rustup target list --installed
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secret
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - name: Build
         env:
diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml
@@ -97,11 +97,8 @@ jobs:
           rustup target add ${{ matrix.build.TARGET }} --toolchain ${{ env.RUST_TOOLCHAIN }}
           rustup target list --installed
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secret
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - name: Build wheel
         uses: PyO3/maturin-action@v1
@@ -155,11 +152,8 @@ jobs:
         with:
           toolchain: ${{ env.RUST_TOOLCHAIN }}
 
-      - name: Create .env file
-        run: |
-          touch .env
-          echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
-          cat .env
+      - name: Export build secret
+        run: echo "CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }}" >> "$GITHUB_ENV"
 
       - name: Build sdist
         uses: PyO3/maturin-action@v1
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ console = "0.16"
 dialoguer = "0.11.0"
 dirs = "6.0"
 
-dotenv_codegen = "0.15"
+
 git2 = "0.20.1"
 home = "0.5.4"
 indicatif = "0.17.11"
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
@@ -30,7 +30,7 @@ console = { workspace = true }
 dialoguer = { workspace = true }
 dirs = { workspace = true }
 
-dotenv_codegen = { workspace = true }
+
 git2 = { workspace = true }
 
 home = { workspace = true }
diff --git a/crates/cli/src/lib.rs b/crates/cli/src/lib.rs
@@ -7,10 +7,7 @@ pub mod project;
 mod token;
 mod ui;
 
-#[macro_use]
-extern crate dotenv_codegen;
-
 pub(crate) fn client() -> (&'static SmbClient, &'static str) {
-    let secret = dotenv!("CLI_CLIENT_SECRET");
+    let secret = env!("CLI_CLIENT_SECRET");
     (&SmbClient::Cli, secret)
 }
diff --git a/docs/cli-install-homebrew.md b/docs/cli-install-homebrew.md
@@ -0,0 +1,35 @@
+# Homebrew Installation
+
+## Install
+
+```bash
+brew tap smbcloudXYZ/tap
+brew install cli
+```
+
+## Verify
+
+```bash
+smb --version
+```
+
+## Upgrade
+
+```bash
+brew upgrade cli
+```
+
+## Uninstall
+
+```bash
+brew uninstall cli
+brew untap smbcloudXYZ/tap
+```
+
+## Pre-built binaries
+
+Homebrew installs a pre-built binary for your platform — no compiler required.
+
+You can also download any release directly from GitHub:
+
+https://github.com/smbcloudXYZ/smbcloud-cli/releases
diff --git a/docs/cli-install-npm.md b/docs/cli-install-npm.md
@@ -0,0 +1,37 @@
+# npm Installation
+
+## Install
+
+```bash
+npm install -g @smbcloud/cli
+```
+
+Also works with pnpm, bun, and yarn:
+
+```bash
+pnpm add -g @smbcloud/cli
+bun add -g @smbcloud/cli
+yarn global add @smbcloud/cli
+```
+
+## Verify
+
+```bash
+smb --version
+```
+
+## Upgrade
+
+```bash
+npm update -g @smbcloud/cli
+```
+
+## Uninstall
+
+```bash
+npm uninstall -g @smbcloud/cli
+```
+
+## Pre-built binaries
+
+All installation methods above use pre-built binaries. You can also download them directly from the [GitHub releases page](https://github.com/smbcloudXYZ/smbcloud-cli/releases) — useful for air-gapped environments, custom install scripts, or pinning to a specific version.
diff --git a/docs/cli-install-pypi.md b/docs/cli-install-pypi.md
@@ -0,0 +1,49 @@
+# PyPI Installation
+
+## Install
+
+Run once without a persistent install:
+
+```bash
+uvx --from smbcloud-cli smb
+```
+
+Install as a persistent tool:
+
+```bash
+uv tool install smbcloud-cli
+```
+
+Or with pip:
+
+```bash
+pip install smbcloud-cli
+```
+
+## Upgrade
+
+```bash
+uv tool upgrade smbcloud-cli
+```
+
+Or with pip:
+
+```bash
+pip install --upgrade smbcloud-cli
+```
+
+## Uninstall
+
+```bash
+uv tool uninstall smbcloud-cli
+```
+
+Or with pip:
+
+```bash
+pip uninstall smbcloud-cli
+```
+
+---
+
+All installation methods above use pre-built binaries — no Rust toolchain required. You can also download the binary directly from [GitHub Releases](https://github.com/smbcloudXYZ/smbcloud-cli/releases).
diff --git a/docs/cli-install.md b/docs/cli-install.md
@@ -0,0 +1,52 @@
+# Native Installation
+
+Install directly from [crates.io](https://crates.io/crates/smbcloud-cli) using Cargo.
+
+## Prerequisites
+
+- [Rust](https://rustup.rs) (stable toolchain)
+- `CLI_CLIENT_SECRET` — required at compile time
+
+The `CLI_CLIENT_SECRET` value is baked into the binary at compile time. Contact [hej@setoelkahfi.se](mailto:hej@setoelkahfi.se) or check your smbCloud account dashboard to obtain it.
+
+## Install
+
+Export the secret, then install:
+
+```bash
+export CLI_CLIENT_SECRET=your_secret_here
+cargo install smbcloud-cli
+```
+
+## Verify
+
+```bash
+smb --version
+```
+
+## Upgrade
+
+```bash
+export CLI_CLIENT_SECRET=your_secret_here
+cargo install smbcloud-cli --force
+```
+
+## Uninstall
+
+```bash
+cargo uninstall smbcloud-cli
+```
+
+## Troubleshooting
+
+**`error: proc-macro derive panicked … Error loading .env file`**
+
+This error appears on older versions of `smbcloud-cli` (before `0.3.37`). Upgrade to the latest version — it reads `CLI_CLIENT_SECRET` directly from the environment at compile time and no longer requires a `.env` file.
+
+**`error[E0463]: can't find crate for std`**
+
+Your Rust toolchain is missing the target. Run:
+
+```bash
+rustup target add <target>
+```
diff --git a/docs/install.md b/docs/install.md
