Change meaning of includedir output

Temporarily disable some tests
MonetDB · Nov 15, 2024 · 2e80c29 · 2e80c29
1 parent 40ee00c
commit 2e80c29
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ on:
 jobs:
 
   documentation-example:
-    if: false
+    if: true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -13,22 +13,22 @@ jobs:
 
 
   binary:
-    if: false
+    if: true
     strategy:
       fail-fast: false
       matrix:
         os:
           - ubuntu-latest       # intel
-          - ubuntu-24.04        # intel
-          - ubuntu-22.04        # intel
-          - ubuntu-20.04        # intel
-          - macos-13            # intel
-          - macos-12            # intel
-          - macos-15            # arm
-          - macos-14            # arm
-          - windows-latest      # intel
-          - windows-2022        # intel
-          - windows-2019        # intel
+          #- ubuntu-24.04        # intel
+          #- ubuntu-22.04        # intel
+          #- ubuntu-20.04        # intel
+          #- macos-13            # intel
+          #- macos-12            # intel
+          #- macos-15            # arm
+          #- macos-14            # arm
+          #- windows-latest      # intel
+          #- windows-2022        # intel
+          #- windows-2019        # intel
     runs-on: ${{ matrix.os }}
     timeout-minutes: 5
     steps:
@@ -40,20 +40,11 @@ jobs:
       uses: ./.
 
     - name: Check activity output parameters
-      if: runner.os != 'Windows'
-      run: |
-        ls "${{ steps.thisaction.outputs.prefix }}"
-        ls "${{ steps.thisaction.outputs.bindir }}/mclient"
-        ls "${{ steps.thisaction.outputs.includedir }}/monetdb/monetdbe.h"
-        ls "${{ steps.thisaction.outputs.libdir }}/libmonetdbe.${{ steps.thisaction.outputs.dynsuffix }}"
-
-    - name: Check activity output parameters
-      if: runner.os == 'Windows'
       run: |
         ls "${{ steps.thisaction.outputs.prefix }}"
-        ls "${{ steps.thisaction.outputs.bindir }}/mclient.bat"
-        ls "${{ steps.thisaction.outputs.includedir }}/monetdb/monetdbe.h"
-        ls "${{ steps.thisaction.outputs.libdir }}/monetdbe.${{ steps.thisaction.outputs.dynsuffix }}"
+        ls "${{ steps.thisaction.outputs.bindir }}/mclient${{ runner.os == 'Windows' && '.bat' || ''}}.bat"
+        ls "${{ steps.thisaction.outputs.includedir }}/monetdbe.h"
+        ls "${{ steps.thisaction.outputs.libdir }}/${{ runner.os != 'Windows' && 'lib' || '' }}monetdbe.${{ steps.thisaction.outputs.dynsuffix }}"
 
     - name: Test mclient --version
       run: mclient --version
@@ -118,6 +109,7 @@ jobs:
 
 
   source:
+    if: false
     strategy:
       fail-fast: false
       matrix:

diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ Outputs
   example `libmonetdbe.so`, `libmonetdbe.dylib` or `monetdbe.dll`.
 
 * **includedir**: Directory where header files have been installed. Will contain
-  for example `monetdb/monetdb_config.h`.
+  for example `monetdbe_config.h`.
 
 
 Example

diff --git a/install-linux-bin.sh b/install-linux-bin.sh
@@ -53,7 +53,7 @@ sudo apt-get -qy install "${packages[@]}"
 # Borrow exact installation directory from libz
 echo "prefix=/usr" >>github.output
 echo "bindir=$prefix/bin"  >>github.output
-echo "includedir=$(pkg-config --variable=includedir zlib)" >>github.output
+echo "includedir=$(pkg-config --variable=includedir zlib)/monetdb" >>github.output
 echo "libdir=$(pkg-config --variable=libdir zlib)" >>github.output
 echo "dynsuffix=so" >>github.output
 

diff --git a/install-macos-bin.sh b/install-macos-bin.sh
@@ -35,6 +35,6 @@ monetdb create -pmonetdb demo monetdb
 prefix="$(brew --prefix)"
 echo "prefix=$prefix" >>github.output
 echo "bindir=$prefix/bin" >>github.output
-echo "includedir=$prefix/include" >>github.output
+echo "includedir=$prefix/include/monetdb" >>github.output
 echo "libdir=$prefix/lib" >>github.output
 echo "dynsuffix=dylib" >>github.output
diff --git a/install-windows-bin/action.yml b/install-windows-bin/action.yml
@@ -41,7 +41,7 @@ runs:
     run: |
       Add-Content github.output "prefix=${{ inputs.prefix }}"
       Add-Content github.output "bindir=${{ inputs.prefix }}"
-      Add-Content github.output "includedir=${{ inputs.prefix }}/include"
+      Add-Content github.output "includedir=${{ inputs.prefix }}/include/monetdb"
       Add-Content github.output "libdir=${{ inputs.prefix }}\bin"
       Add-Content github.output "dynsuffix=dll"
       cat github.output