Merge branch 'master' of github.com:MonetDBSolutions/MonetDBe-Java

small fixes
MonetDBSolutions · Jul 8, 2024 · 06be84b · 06be84b
2 parents 35136ee + 950325b
commit 06be84b
Show file tree

Hide file tree

Showing 85 changed files with 2,504 additions and 812 deletions.
diff --git a/.github/workflows/linux-dev.yml b/.github/workflows/linux-dev.yml
@@ -7,11 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        container: ["monetdb/dev-builds:default", "monetdb/dev-builds:Aug2024"]
+        container: ["monetdb/dev-builds:default_manylinux", "monetdb/dev-builds:Aug2024_manylinux", "monetdb/dev-builds:Dec2023_manylinux"]
     container:
       image: ${{ matrix.container }}
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: "master"
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
@@ -20,8 +22,14 @@ jobs:
         uses: stCarolas/setup-maven@v4
         with:
           maven-version: 3.6.3
-      - name: Build with Maven
-        run: $GITHUB_WORKSPACE/build_dev.sh /usr/local
+      - name: Install packages
+        run: yum install -y wget
+      - name: Set up test environment
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/testdata/taxi $GITHUB_WORKSPACE/testdata/localdb
+          wget -O testdata/taxi/yellow_tripdata_2016-01.csv https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2016-01.csv
+      - name: Build with Maven and test
+        run: $GITHUB_WORKSPACE/build_dev.sh /usr/local false
       - name: Run example class (SimpleTypes)
         run: $GITHUB_WORKSPACE/run_dev.sh SimpleTypes
   #linux_manual_dev_build:

diff --git a/.github/workflows/linux-release.yml b/.github/workflows/linux-release.yml
@@ -6,26 +6,51 @@ jobs:
     name: manylinux_jars
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        artifact: ["slim", "fat"]
-    container: monetdb/dev-builds:Jul2021_manylinux
+        container: ["monetdb/dev-builds:default_manylinux","monetdb/dev-builds:Jan2022_manylinux","monetdb/dev-builds:Jul2021_manylinux"]
+        artifact: ["slim","fat"]
+        include:
+          - container: "monetdb/dev-builds:default_manylinux"
+            artifact: "slim"
+            mdb_version: "default"
+          - container: "monetdb/dev-builds:default_manylinux"
+            artifact: "fat"
+            mdb_version: "default"
+          - container: "monetdb/dev-builds:Jan2022_manylinux"
+            artifact: "slim"
+            mdb_version: "Jan2022"
+          - container: "monetdb/dev-builds:Jan2022_manylinux"
+            artifact: "fat"
+            mdb_version: "Jan2022"
+          - container: "monetdb/dev-builds:Jul2021_manylinux"
+            artifact: "slim"
+            mdb_version: "Jul2021"
+          - container: "monetdb/dev-builds:Jul2021_manylinux"
+            artifact: "fat"
+            mdb_version: "Jul2021"
+    container:
+      image: ${{ matrix.container }}
     env:
-      MDBE_JAVA_VERSION: 1.0-SNAPSHOT
+      MDBE_JAVA_VERSION: "1.11-SNAPSHOT"
       MONETDB_INSTALL: /usr/local
+      MDB_VERSION: ${{ matrix.mdb_version }}
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: "master"
 
       #Set global environment variables
       - name: Env variables (slim jar)
         if: ${{ matrix.artifact == 'slim' }}
         run: |
-          echo "MVN_FLAGS=linux-slim,release" >> $GITHUB_ENV
+          echo "MVN_FLAGS=linux-slim" >> $GITHUB_ENV
           echo "ARTIFACT=monetdbe-java-${{ env.MDBE_JAVA_VERSION }}-linux-slim.jar" >> $GITHUB_ENV
-          echo "M2_REPO=/root/.m2/repository/monetdb/monetdbe-java/${{ env.MDBE_JAVA_VERSION }}" >> $GITHUB_ENV
+          echo "M2_REPO=/root/.m2/repository/monetdb/monetdbe-java/${{ env.MDBE_JAVA_VERSION }}" >> $GITHUB_ENV+
       - name: Env variables (fat jar)
         if: ${{ matrix.artifact == 'fat' }}
         run: |
-          echo "MVN_FLAGS=linux-slim,linux-fat,release" >> $GITHUB_ENV
+          echo "MVN_FLAGS=linux-slim,linux-fat" >> $GITHUB_ENV
           echo "ARTIFACT=monetdbe-java-${{ env.MDBE_JAVA_VERSION }}-linux-fat.jar" >> $GITHUB_ENV
           echo "M2_REPO=/root/.m2/repository/monetdb/monetdbe-java/${{ env.MDBE_JAVA_VERSION }}" >> $GITHUB_ENV
 
@@ -43,17 +68,16 @@ jobs:
         uses: stCarolas/setup-maven@v4
         with:
           maven-version: 3.6.3
-      - name: Install patchelf
-        run: yum install -y patchelf
-      - name: Import GPG private key for maven release (for sign-maven-plugin)
-        run: |
-          touch /root/.m2/sign-key.asc
-          echo -e "${{ secrets.MVN_GPG_PRIVATE_KEY_SIMPLIFY }}" > /root/.m2/sign-key.asc
+      - name: Install packages
+        run: yum install -y patchelf chrpath wget
+      #- name: Import GPG private key for maven release (for sign-maven-plugin)
+      #  run: |
+      #    touch /root/.m2/sign-key.asc
+      #    echo -e "${{ secrets.MVN_GPG_PRIVATE_KEY_SIMPLIFY }}" > /root/.m2/sign-key.asc
       - name: Set up test environment
         run: |
           mkdir -p $GITHUB_WORKSPACE/testdata/taxi $GITHUB_WORKSPACE/testdata/localdb
           wget -O testdata/taxi/yellow_tripdata_2016-01.csv https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2016-01.csv
-
       #Install native library; collect library dependencies
       - name: Install native library (libmonetdbe-java.dylib)
         run: |
@@ -68,7 +92,9 @@ jobs:
           MONETDB_LIBS: ${{ env.MONETDB_INSTALL }}/lib64
       - name: Change rpath of MonetDB libraries to package
         run: |
-          for file in $GITHUB_WORKSPACE/collect_libs/*; do patchelf --set-rpath $ORIGIN/. $file; done
+          ldd $GITHUB_WORKSPACE/collect_libs/*
+          for file in $GITHUB_WORKSPACE/collect_libs/*; do chrpath -r \$\ORIGIN/. $file; done
+          ldd $GITHUB_WORKSPACE/collect_libs/*
       - name: Collect transitive dependencies (only for fat jar)
         if: ${{ matrix.artifact == 'fat' }}
         run: cp /lib64/libz.so.1 /lib64/libpcre.so.1 collect_libs
@@ -77,21 +103,29 @@ jobs:
       - name: Compile Java, package into jar, do unit tests and deploy
         run: |
           cd java
-          echo ${{ secrets.MVN_GPG_PRIVATE_KEY_USERNAME }} > /root/.m2/private.key
-          mvn clean deploy -DCOLLECT_LIBS=$GITHUB_WORKSPACE/collect_libs -P ${{ env.MVN_FLAGS }} --no-transfer-progress
+          mvn clean install -DCOLLECT_LIBS=$GITHUB_WORKSPACE/collect_libs -P ${{ env.MVN_FLAGS }} --no-transfer-progress
           cd ..
         env:
           MVN_DEPLOY_USERNAME: monetdb
           MVN_DEPLOY_PASSWORD: ${{ secrets.MVN_DEPLOY_PASSWORD }}
+          MVN_GPG_PRIVATE_KEY: ${{ secrets.MVN_GPG_PRIVATE_KEY }}
           MVN_GPG_PASSPHRASE: ${{ secrets.MVN_GPG_PASSPHRASE }}
 
       #Run example and publish jar
       - name: Run example class (SimpleTypes)
         run: |
           javac -cp ${{env.M2_REPO}}/${{env.ARTIFACT}} example/SimpleTypes.java
           java -cp ${{env.M2_REPO}}/${{env.ARTIFACT}}:example/ SimpleTypes
+
+      - name: Publish error log
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: hs_err.log
+          path: /__w/MonetDBe-Java/MonetDBe-Java/hs_err_pid*.log
       - name: Publish Linux jar
         uses: actions/upload-artifact@v2
+        if: always()
         with:
-          name: ${{env.ARTIFACT}}
+          name: ${{ env.MDB_VERSION }}-${{env.ARTIFACT}}
           path: ${{env.M2_REPO}}/${{env.ARTIFACT}}
diff --git a/.github/workflows/mac-dev.yml b/.github/workflows/mac-dev.yml
@@ -7,6 +7,8 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: "master"
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
@@ -17,7 +19,45 @@ jobs:
           maven-version: 3.6.3
       - name: Install monetdb through brew
         run: brew install monetdb
-      - name: Build with Maven
-        run: $GITHUB_WORKSPACE/build_dev.sh /usr/local
+      - name: Set up test environment
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/testdata/taxi $GITHUB_WORKSPACE/testdata/localdb
+          wget -O testdata/taxi/yellow_tripdata_2016-01.csv https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2016-01.csv
+      - name: Build with Maven and test
+        run: $GITHUB_WORKSPACE/build_dev.sh /usr/local false
+      - name: Run example class (SimpleTypes)
+        run: $GITHUB_WORKSPACE/run_dev.sh SimpleTypes
+  mac_manual_dev_build:
+      name: mac_manual_dev_build
+      runs-on: macos-latest
+      steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Setup Maven
+        uses: stCarolas/setup-maven@v4
+      - name: Get brew bison
+        run: brew install bison
+      - name: Get monetdb
+        run: git clone https://github.com/MonetDB/MonetDB
+      - name: Compile and install MonetDB
+        run: |
+          export CMAKE_LIBRARY_PATH="/usr/local/opt/bison/lib"
+          export PATH="/usr/local/opt/bison/bin/:$PATH"
+          export LDFLAGS="-L/usr/local/opt/bison/lib/"
+          cd MonetDB
+          mkdir build MonetDB-default
+          cd build
+          cmake ../ -DCMAKE_INSTALL_PREFIX=/Users/runner/work/MonetDBe-Java/MonetDBe-Java/MonetDB/MonetDB-default/ -DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF
+          make install
+          cd ../../
+      - name: Set up test environment
+        run: |
+          mkdir -p $GITHUB_WORKSPACE/testdata/taxi $GITHUB_WORKSPACE/testdata/localdb
+          wget -O testdata/taxi/yellow_tripdata_2016-01.csv https://s3.amazonaws.com/nyc-tlc/trip+data/yellow_tripdata_2016-01.csv
+      - name: Build with Maven and test
+        run: $GITHUB_WORKSPACE/build_dev.sh $GITHUB_WORKSPACE/MonetDB/MonetDB-default/ false
       - name: Run example class (SimpleTypes)
         run: $GITHUB_WORKSPACE/run_dev.sh SimpleTypes