diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 369593d..48c0989 100644 --- 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 \ No newline at end of file + prerelease: true diff --git a/.github/workflows/build_var.json b/.github/workflows/build_var.json index 36989a1..f237157 100644 --- 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" } ] } \ No newline at end of file diff --git a/SConstruct b/SConstruct index f10c435..4ed33e6 100644 --- 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'])