From c21c77bcd412dae77308c6137d85256c65329c67 Mon Sep 17 00:00:00 2001
From: Tom Hu <thomas.hu@sentry.io>
Date: Sun, 26 Jan 2025 20:42:46 -0300
Subject: [PATCH] fix: split the pypi and asset building

---
 .github/workflows/build_assets.yml   | 17 +++++++----------
 .github/workflows/build_for_pypi.yml | 11 ++++-------
 .github/workflows/build_main.yml     | 17 -----------------
 pyproject.toml                       |  1 -
 requirements.txt                     |  2 --
 5 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 .github/workflows/build_main.yml

diff --git a/.github/workflows/build_assets.yml b/.github/workflows/build_assets.yml
index 53b55dc78..e903737e4 100644
--- a/.github/workflows/build_assets.yml
+++ b/.github/workflows/build_assets.yml
@@ -2,12 +2,9 @@
 name: Build Compiled Assets
 
 on:
-  workflow_call:
-    inputs:
-      release:
-        type: boolean
-        default: false
-        description: "Attach artifacts to a release"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build_assets:
@@ -68,12 +65,12 @@ jobs:
         run: ${{matrix.CMD_BUILD}}
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4
-        if: inputs.release == false
+        if: startsWith(github.ref, 'refs/tags/')
         with:
           name: ${{ matrix.OUT_FILE_NAME }}
           path: ./dist/${{ matrix.OUT_FILE_NAME }}
       - name: Upload Release Asset
-        if: inputs.release == true
+        if: startsWith(github.ref, 'refs/tags/')
         id: upload-release-asset
         uses: svenstaro/upload-release-action@v2
         with:
@@ -118,12 +115,12 @@ jobs:
           ./scripts/build_${{ matrix.distro_name }}_arm.sh ${{ matrix.distro_name }}_${{ matrix.arch }}
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v4
-      if: inputs.release == false
+      if: startsWith(github.ref, 'refs/tags/')
       with:
         name: codecovcli_${{ matrix.distro_name }}_${{ matrix.arch }}
         path: ./dist/codecovcli_${{ matrix.distro_name }}_${{ matrix.arch }}
     - name: Upload Release Asset
-      if: inputs.release == true
+      if: startsWith(github.ref, 'refs/tags/')
       id: upload-release-asset
       uses: svenstaro/upload-release-action@v2
       with:
diff --git a/.github/workflows/build_for_pypi.yml b/.github/workflows/build_for_pypi.yml
index 99ce9a715..f4a7558f5 100644
--- a/.github/workflows/build_for_pypi.yml
+++ b/.github/workflows/build_for_pypi.yml
@@ -1,12 +1,9 @@
 name: Build and Optionally Publish to PyPi
 
 on:
-  workflow_call:
-    inputs:
-      publish:
-        type: boolean
-        default: false
-        description: "Publish to PyPi"
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build_dist_for_pypi:
@@ -77,7 +74,7 @@ jobs:
             ./dist/*.tar.gz
             ./dist/*.whl
       - name: Publish package to PyPi
-        if: inputs.publish == true
+        if: startsWith(github.ref, 'refs/tags/')
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           attestations: false
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
deleted file mode 100644
index d59b8b549..000000000
--- a/.github/workflows/build_main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
-name: Build
-
-on:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build_and_publish_to_pipy:
-    uses: ./.github/workflows/build_for_pypi.yml
-    secrets: inherit
-  build_assets:
-    uses: ./.github/workflows/build_assets.yml
-    secrets: inherit
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 7cb776445..fd4c8c9bd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,6 @@ dependencies = [
     "click==8.*",
     "httpx==0.27.*",
     "ijson==3.*",
-    "pathspec>=0.12.1",
     "pyyaml==6.*",
     "regex",
     "responses==0.21.*",
diff --git a/requirements.txt b/requirements.txt
index 87b11a67d..8942ca8fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,8 +29,6 @@ idna==3.10
     #   requests
 ijson==3.3.0
     # via codecov-cli (pyproject.toml)
-pathspec==0.12.1
-    # via codecov-cli (pyproject.toml)
 pyyaml==6.0.2
     # via codecov-cli (pyproject.toml)
 regex==2024.11.6