From 61c9231401214aee390ceef247430f1f2f855a97 Mon Sep 17 00:00:00 2001 From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> Date: Sat, 12 Oct 2024 21:12:53 +1100 Subject: [PATCH] CI: Fix binstalk-git-repo-api on PR of forks (#1932) * Rm CI_UNIT_TEST_GITHUB_TOKEN fallback for unit-tests As it would break unit testing Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * CI: Fix gh_api_client.rs test Ignore empty gh token Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Update crates/binstalk-git-repo-api/src/gh_api_client.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> * Update crates/binstalk-git-repo-api/src/gh_api_client.rs Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --------- Signed-off-by: Jiahao XU <30436523+NobodyXu@users.noreply.github.com> --- .github/workflows/ci.yml | 2 +- crates/binstalk-git-repo-api/src/gh_api_client.rs | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63132171..9a0acffc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: if: env.CARGO_NEXTEST_ADDITIONAL_ARGS != '' env: GITHUB_TOKEN: ${{ secrets.CI_TEST_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} - CI_UNIT_TEST_GITHUB_TOKEN: ${{ secrets.CI_UNIT_TEST_GITHUB_TOKEN || secrets.GITHUB_TOKEN }} + CI_UNIT_TEST_GITHUB_TOKEN: ${{ secrets.CI_UNIT_TEST_GITHUB_TOKEN }} e2e-tests: if: github.event_name != 'pull_request' diff --git a/crates/binstalk-git-repo-api/src/gh_api_client.rs b/crates/binstalk-git-repo-api/src/gh_api_client.rs index 5b9405d9..60856f66 100644 --- a/crates/binstalk-git-repo-api/src/gh_api_client.rs +++ b/crates/binstalk-git-repo-api/src/gh_api_client.rs @@ -527,10 +527,12 @@ mod test { fn create_client() -> Vec { let client = create_remote_client(); - let auth_token = env::var("CI_UNIT_TEST_GITHUB_TOKEN") - .ok() - .map(Box::::from) - .map(zeroize::Zeroizing::new); + let auth_token = match env::var("CI_UNIT_TEST_GITHUB_TOKEN") { + Ok(auth_token) if !auth_token.is_empty() => { + Some(zeroize::Zeroizing::new(auth_token.into_boxed_str())) + } + _ => None, + }; let gh_client = GhApiClient::new(client.clone(), auth_token.clone()); gh_client.set_only_use_restful_api();