Fix artifact uploading

PostHog · Oct 6, 2023 · fe45b98 · fe45b98
1 parent 658d2a2
commit fe45b98
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/build-hogql-parser.yml b/.github/workflows/build-hogql-parser.yml
@@ -41,13 +41,16 @@ jobs:
               run: python -m pip install cibuildwheel==2.16.*
 
             - name: Build wheels
-              run: cd hogql_parser && python -m cibuildwheel --output-dir wheelhouse
+              run: cd hogql_parser && python -m cibuildwheel --output-dir dist
               env:
                   MACOSX_DEPLOYMENT_TARGET: '12' # A modern target allows us to use C++20
 
             - uses: actions/upload-artifact@v3
               with:
-                  path: hogql_parser/wheelhouse/*.{whl,tar.gz}
+                  path: |
+                      hogql_parser/dist/*.whl
+                      hogql_parser/dist/*.tar.gz
+                  if-no-files-found: error
 
     publish:
         name: Publish on PyPI

diff --git a/hogql_parser/setup.py b/hogql_parser/setup.py
@@ -21,17 +21,11 @@
     ],
     include_dirs=[
         f"{homebrew_location}/include/" if is_macos else "/usr/include/",
-        f"{homebrew_location}/include/antlr4-runtime/"
-        if is_macos
-        else "/usr/local/include/antlr4-runtime/",
+        f"{homebrew_location}/include/antlr4-runtime/" if is_macos else "/usr/local/include/antlr4-runtime/",
     ],
     library_dirs=[
-        f"{homebrew_location}/Cellar/boost/1.82.0_1/lib/"
-        if is_macos == "Darwin"
-        else "/usr/lib64/",
-        f"{homebrew_location}/Cellar/antlr4-cpp-runtime/4.13.1/lib/"
-        if is_macos == "Darwin"
-        else "/usr/local/lib/",
+        f"{homebrew_location}/Cellar/boost/1.82.0_1/lib/" if is_macos == "Darwin" else "/usr/lib64/",
+        f"{homebrew_location}/Cellar/antlr4-cpp-runtime/4.13.1/lib/" if is_macos == "Darwin" else "/usr/local/lib/",
     ],
     libraries=["antlr4-runtime"],
     extra_compile_args=["-std=c++20"],