Remove conflict handling from GH_TOKEN aliases (#1724)

Signed-off-by: William Woodruff <william@yossarian.net>

Author: woodruffw

crates/zizmor/src/main.rs

@@ -95,15 +95,15 @@ struct App {
     offline: bool,
 
     /// The GitHub API token to use [env: GH_TOKEN or GITHUB_TOKEN or ZIZMOR_GITHUB_TOKEN]
-    #[arg(long, env, hide_env = true, value_parser = GitHubToken::new, conflicts_with_all = ["github_token", "zizmor_github_token"])]
+    #[arg(long, env, hide_env = true, value_parser = GitHubToken::new)]
     gh_token: Option<GitHubToken>,
 
     /// This is an alias for `--gh-token` / `GH_TOKEN`.
-    #[arg(long, env, hide = true, value_parser = GitHubToken::new, conflicts_with_all = ["gh_token", "zizmor_github_token"])]
+    #[arg(long, env, hide = true, value_parser = GitHubToken::new)]
     github_token: Option<GitHubToken>,
 
     /// This is an alias for `--gh-token` / `GH_TOKEN` / `--github-token` / `GITHUB_TOKEN`
-    #[arg(long, env, hide = true, value_parser = GitHubToken::new, conflicts_with_all = ["gh_token", "github_token"])]
+    #[arg(long, env, hide = true, value_parser = GitHubToken::new)]
     zizmor_github_token: Option<GitHubToken>,
 
     /// The GitHub Server Hostname. Defaults to github.com

crates/zizmor/tests/integration/cli.rs

@@ -4,8 +4,6 @@
 mod acceptance;
 /// Audit-specific tests.
 mod audit;
-/// Basic CLI tests.
-mod cli;
 /// Helpers.
 mod common;
 /// Configuration discovery tests.

crates/zizmor/tests/integration/main.rs

@@ -9,6 +9,11 @@ of `zizmor`.
 
 ## Next (UNRELEASED)
 
+### Bug Fixes 🐛
+
+* Fixed a bug where `zizmor` would error if given both a `GH_TOKEN` and
+  a `GITHUB_TOKEN` (or `ZIZMOR_GITHUB_TOKEN`) via the environment (#1724)
+
 ### New Features 🌈
 
 * **New audit**: [secrets-outside-env] detects usage of the `secrets` context