updated build vars

mrjsj · May 21, 2024 · 6bc9fbf · 6bc9fbf
1 parent 4903657
commit 6bc9fbf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -102,29 +102,29 @@ jobs:
           cd ${{ env.PROJECT_FOLDER }}
           scons platform=windows target=${{ matrix.target }} target_path=${{ env.TARGET_PATH }} duckdb_lib_path=${{ matrix.duckdb-url-name }} duckdb_lib_name=${{ matrix.duckdb-lib-name }} target_name=${{ env.TARGET_NAME }} -j6 ${{ matrix.flags }}
 
-      - name: Not Windows Compilation
-        if: runner.os != 'Windows'
-        run: |
-          mkdir -v -p ${{ env.PROJECT_FOLDER }}/${{ env.TARGET_PATH }}
-          cd ${{ env.PROJECT_FOLDER }}
-          ls -R
-          scons platform=${{ matrix.platform }} target=${{ matrix.target }} target_path=${{ env.TARGET_PATH }} target_name=${{ env.TARGET_NAME }} -j6 ${{ matrix.flags }}
-
-      - name: Copy DuckDB binaries and fix link (MacOS)
-        if: ${{ matrix.platform == 'macos' }}
-        run: |
-          cp ./src/duckdb/libduckdb.dylib ./${{ env.TARGET_PATH }}/libduckdb.dylib
-          install_name_tool -change @rpath/libduckdb.dylib @loader_path/../libduckdb.dylib ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.macos.template_debug.framework/${{ env.TARGET_NAME }}.macos.template_debug
-          ls -R ./${{ env.TARGET_PATH }}
-          otool -L ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.macos.template_debug.framework/${{ env.TARGET_NAME }}.macos.template_debug
-
-      - name: Copy DuckDB binaries and fix link (Not MacOS)
-        if: ${{ matrix.platform != 'macos' }}
-        run: |
-          cp ./src/duckdb/libduckdb.dylib ./${{ env.TARGET_PATH }}/libduckdb.dylib
-          install_name_tool -change @rpath/libduckdb.dylib @loader_path/../libduckdb.dylib ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}${{ env.suffix }}${{ env.SHLIBSUFFIX }}
-          ls -R ./${{ env.TARGET_PATH }}          
-          otool -L ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}${{ env.suffix }}${{ env.SHLIBSUFFIX }}        
+      # - name: Not Windows Compilation
+      #   if: runner.os != 'Windows'
+      #   run: |
+      #     mkdir -v -p ${{ env.PROJECT_FOLDER }}/${{ env.TARGET_PATH }}
+      #     cd ${{ env.PROJECT_FOLDER }}
+      #     ls -R
+      #     scons platform=${{ matrix.platform }} target=${{ matrix.target }} target_path=${{ env.TARGET_PATH }} target_name=${{ env.TARGET_NAME }} -j6 ${{ matrix.flags }}
+
+      # - name: Copy DuckDB binaries and fix link (MacOS)
+      #   if: ${{ matrix.platform == 'macos' }}
+      #   run: |
+      #     cp ./src/duckdb/libduckdb.dylib ./${{ env.TARGET_PATH }}/libduckdb.dylib
+      #     install_name_tool -change @rpath/libduckdb.dylib @loader_path/../libduckdb.dylib ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.macos.template_debug.framework/${{ env.TARGET_NAME }}.macos.template_debug
+      #     ls -R ./${{ env.TARGET_PATH }}
+      #     otool -L ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.macos.template_debug.framework/${{ env.TARGET_NAME }}.macos.template_debug
+
+      # - name: Copy DuckDB binaries and fix link (Not MacOS)
+      #   if: ${{ matrix.platform != 'macos' }}
+      #   run: |
+      #     cp ./src/duckdb/libduckdb.dylib ./${{ env.TARGET_PATH }}/libduckdb.dylib
+      #     install_name_tool -change @rpath/libduckdb.dylib @loader_path/../libduckdb.dylib ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}${{ env.suffix }}${{ env.SHLIBSUFFIX }}
+      #     ls -R ./${{ env.TARGET_PATH }}          
+      #     otool -L ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}${{ env.suffix }}${{ env.SHLIBSUFFIX }}        
 
       - name: Upload Artifact
         env:

diff --git a/.github/workflows/build_var.json b/.github/workflows/build_var.json
@@ -10,7 +10,7 @@
             "artifact-extension": "framework",
             "flags": "arch=universal",
             "cache-name": "macos-universal",
-            "duckdb-url-name": "https://github.com/duckdb/duckdb/releases/download/v0.10.2/libduckdb-osx-universal.zip",
+            "duckdb-url-name": "libduckdb-osx-universal",
             "duckdb-lib-name": "libduckdb.dylib"            
         },
         {
@@ -21,7 +21,7 @@
             "additional-python-packages": "pywin32",
             "cache-name": "win-x86_64-msvc",
             "skip": true,
-            "duckdb-url-name": "libduckdb-windows-amd64.zip",
+            "duckdb-url-name": "libduckdb-windows-amd64",
             "duckdb-lib-name": "libduckdb.dylib"            
         },
         {
@@ -31,7 +31,7 @@
             "artifact-extension": "dll",
             "flags": "use_mingw=yes",
             "cache-name": "win-x86_64-mingw",
-            "duckdb-url-name": "https://github.com/duckdb/duckdb/releases/download/v0.10.2/libduckdb-windows-amd64.zip",
+            "duckdb-url-name": "libduckdb-windows-amd64",
             "duckdb-lib-name": "duckdb.dll"              
         }
     ]