Changeset: a064298b4937 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a064298b4937
Branch: new_rmt_opt
Log Message:

merged with default


diffs (84 lines):

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -17,7 +17,28 @@ jobs:
       fail-fast: false  # don't stop other jobs
       matrix:
         branch: [ master ]
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        c_compiler: [ gcc, clang, cl ]
+        include:
+          - os: windows-latest
+            c_compiler: cl
+          - os: macos-latest
+            c_compiler: clang
+          - os: macos-latest
+            c_compiler: gcc
+          - os: ubuntu-latest
+            c_compiler: gcc
+          - os: ubuntu-latest
+            c_compiler: clang
+        exclude:
+          - os: windows-latest
+            c_compiler: gcc
+          - os: windows-latest
+            c_compiler: clang
+          - os: macos-latest
+            c_compiler: cl
+          - os: ubuntu-latest
+            c_compiler: cl
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
@@ -29,7 +50,13 @@ jobs:
         run: |
           mkdir build
           cd build 
-          cmake ..  -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }} 
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF 
\
+          cmake ..  \
+            -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }} \
+            -DPY3INTEGRATION=OFF \
+            -DRINTEGRATION=OFF \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DASSERT=OFF \
+            -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
             -DCMAKE_SUMMARY=ON
           make install -j3
         if: runner.os == 'Linux'
@@ -41,8 +68,15 @@ jobs:
         run: |
           mkdir build
           cd build 
-          cmake ..  -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }} 
-DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF -DRINTEGRATION=OFF 
 \
-            -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison 
-DCMAKE_SUMMARY=ON
+          cmake .. \
+            -DCMAKE_INSTALL_PREFIX=$HOME/${{ matrix.branch }} \
+            -DPY3INTEGRATION=OFF \
+            -DRINTEGRATION=OFF  \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DASSERT=OFF \
+            -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
+            -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison \
+            -DCMAKE_SUMMARY=ON
           make install -j3
         if: runner.os == 'macOS'
       - name: ctest 
@@ -63,4 +97,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: mtest-${{ matrix.branch }}
-          path: ${{ matrix.branch }}/mTests/*
+          path: $HOME/${{ matrix.branch }}/mTests/*
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -700,7 +700,7 @@ thread_starter(void *arg)
        char *name = GDKstrndup(self->threadname, 15);
        if (name != NULL) {
                pthread_setname_np(
-#ifdef __USE_GNU
+#ifndef __APPLE__
                        pthread_self(),
 #endif
                        name);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

Reply via email to