test more builds

mrjsj · May 22, 2024 · a3178c6 · a3178c6
1 parent a15e773
commit a3178c6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -110,21 +110,21 @@ jobs:
       #   run: |
       #     dumpbin /DEPENDENTS ${{ env.TARGET_PATH }}\libgdduckdb.windows.template_debug.x86_64
 
-      # - 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: 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 (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' }}
@@ -179,4 +179,4 @@ jobs:
             ${{ env.PROJECT_FOLDER }}/demo.zip
             ${{ env.PROJECT_FOLDER }}/${{ env.TARGET_PATH }}/../bin.zip
           draft: true
-          prerelease: true
+          prerelease: true
diff --git a/.github/workflows/build_var.json b/.github/workflows/build_var.json
@@ -33,6 +33,13 @@
             "cache-name": "win-x86_64-mingw",
             "duckdb-url-name": "libduckdb-windows-amd64",
             "duckdb-lib-name": "duckdb"              
+        },
+        {
+            "name": "Ubuntu (GCC)",
+            "os": "ubuntu-20.04",
+            "platform": "linux",
+            "artifact-extension": "so",
+            "cache-name": "linux-x86_64"
         }
     ]
 }
diff --git a/SConstruct b/SConstruct
@@ -27,8 +27,8 @@ env.Append(CPPPATH=["src/"])
 sources = [Glob("src/*.cpp")]
 
 # Add duckdb dylib as dependency
-env.Append(LIBPATH=[duckdb_lib_path])
-env.Append(LIBS=[duckdb_lib_name])
+# env.Append(LIBPATH=[duckdb_lib_path])
+# env.Append(LIBS=[duckdb_lib_name])
 
 # Allow exceptions in code, this is required becausse DuckDB throws errors
 env.Append(CCFLAGS=['-fexceptions'])