try linux build

mrjsj · Jun 15, 2024 · 92db196 · 92db196
1 parent 9e70970
commit 92db196
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -108,20 +108,18 @@ jobs:
           cp ${{ matrix.duckdb-url-name }}\${{ matrix.duckdb-lib-name }}.dll ${{ env.TARGET_PATH }}\${{ matrix.duckdb-lib-name }}.dll
           cp ${{ matrix.duckdb-url-name }}\${{ matrix.duckdb-lib-name }}.lib ${{ env.TARGET_PATH }}\${{ matrix.duckdb-lib-name }}.lib          
           ls -R
-          scons platform=windows target=${{ matrix.target }} target_path=${{ env.TARGET_PATH }} duckdb_lib_path=${{ matrix.duckdb-url-name }} duckdb_lib_name=duckdb target_name=${{ env.TARGET_NAME }} -j6 ${{ matrix.flags }}
-
-      # - name: Windows Compilation Dump Dependants
-      #   if: runner.os == 'Windows'
-      #   run: |
-      #     dumpbin /DEPENDENTS ${{ env.TARGET_PATH }}\libgdduckdb.windows.template_debug.x86_64
+          scons platform=${{ matrix.platform }} target=${{ matrix.target }} target_path=${{ env.TARGET_PATH }} duckdb_lib_path=${{ matrix.duckdb-url-name }} duckdb_lib_name=duckdb target_name=${{ env.TARGET_NAME }} -j6 ${{ matrix.flags }}
 
       - name: Not Windows Compilation
         if: runner.os != 'Windows'
         run: |
+          curl -OL ${{ env.DUCKDB_BASE_URL }}${{ matrix.duckdb-url-name }}.zip
+          unzip ${{ matrix.duckdb-url-name }}.zip -d ${{ matrix.duckdb-url-name }}
+        
           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 }}
+          scons platform=${{ matrix.platform }} 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: Copy DuckDB binaries and fix link (MacOS)
         if: ${{ matrix.platform == 'macos' }}
@@ -131,6 +129,12 @@ jobs:
           ls -R ./${{ env.TARGET_PATH }}
           otool -L ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.${{ matrix.platform }}.${{ matrix.target }}.framework/${{ env.TARGET_NAME }}.${{ matrix.platform }}.${{ matrix.target }}
 
+      # - name: Copy DuckDB binaries (linux)
+      #   if: ${{ matrix.platform == 'linux' }}
+      #   run: |
+      #     cp ./src/duckdb/libduckdb.so ./${{ env.TARGET_PATH }}/libduckdb.so
+      #     ls -R ./${{ env.TARGET_PATH }}
+      #     ldd ./${{ env.TARGET_PATH }}${{ env.TARGET_NAME }}.${{ matrix.platform }}.${{ matrix.target }}.so
       # - name: Copy DuckDB binaries and fix link (Not MacOS)
       #   if: ${{ matrix.platform != 'macos' }}
       #   run: |

diff --git a/.github/workflows/build_var.json b/.github/workflows/build_var.json
@@ -1,7 +1,6 @@
 {
     "targets": [
-        "template_debug",
-        "template_release"
+        "template_debug"
     ],
     "jobs": [
         {
@@ -10,6 +9,7 @@
             "platform": "macos",
             "artifact-extension": "framework",
             "flags": "arch=universal",
+            "skip": true,
             "cache-name": "macos-universal",
             "duckdb-url-name": "libduckdb-osx-universal",
             "duckdb-lib-name": "libduckdb.dylib"            
@@ -30,19 +30,32 @@
             "os": "windows-latest",
             "platform": "windows",
             "artifact-extension": "dll",
+            "skip": true,
             "flags": "use_mingw=yes",
             "cache-name": "win-x86_64-mingw",
             "duckdb-url-name": "libduckdb-windows-amd64",
-            "duckdb-lib-name": "duckdb"              
+            "duckdb-lib-name": "duckdb"
         },
         {
-            "name": "Ubuntu (GCC)",
+            "name": "Ubuntu (x86_64)",
             "os": "ubuntu-20.04",
             "platform": "linux",
             "artifact-extension": "so",
-            "skip": true,
-            "cache-name": "linux-x86_64"
+            "skip": false,
+            "cache-name": "linux-x86_64",
+            "duckdb-url-name": "libduckdb-linux-amd64",
+            "duckdb-lib-name": "libduckdb.so"            
         },
+        {
+            "name": "Ubuntu (arm64)",
+            "os": "ubuntu-20.04",
+            "platform": "linux",
+            "artifact-extension": "so",
+            "skip": false,
+            "cache-name": "linux-x86_64",
+            "duckdb-url-name": "libduckdb-linux-aarch64",
+            "duckdb-lib-name": "libduckdb.so"            
+        },        
         {
             "name": "Android (x86_64)",
             "os": "ubuntu-20.04",