Changes for CI tests

libyal · Apr 13, 2024 · bfd056d · bfd056d
1 parent e71dedd
commit bfd056d
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,55 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse-dev libssl-dev libtool pkg-config
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config
+    - name: Download test data
+      run: |
+        if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
+    - name: Building from source
+      env:
+        CC: ${{ matrix.compiler }}
+      run: |
+        tests/build.sh ${{ matrix.configure_options }}
+    - name: Run tests
+      run: |
+        tests/runtests.sh
+  build_fuse_ubuntu:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+        - architecture: 'x64'
+          compiler: 'gcc'
+          configure_options: ''
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install build dependencies
+      run: |
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config libfuse-dev
+    - name: Download test data
+      run: |
+        if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
+    - name: Building from source
+      env:
+        CC: ${{ matrix.compiler }}
+      run: |
+        tests/build.sh ${{ matrix.configure_options }}
+    - name: Run tests
+      run: |
+        tests/runtests.sh
+  build_fuse3_ubuntu:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        include:
+        - architecture: 'x64'
+          compiler: 'gcc'
+          configure_options: ''
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install build dependencies
+      run: |
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config libfuse3-dev
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -66,7 +114,7 @@ jobs:
       run: |
         sudo add-apt-repository universe &&
         sudo apt-get update &&
-        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse-dev libssl-dev libtool pkg-config python3-dev python-dev-is-python3
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config python3-dev python-dev-is-python3
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
@@ -99,7 +147,7 @@ jobs:
       run: |
         sudo add-apt-repository universe &&
         sudo apt-get update &&
-        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse-dev libssl-dev libtool pkg-config python3-dev python-dev-is-python3
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config python3-dev python-dev-is-python3
     - name: Building from source
       env:
         CC: ${{ matrix.compiler }}
@@ -123,7 +171,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse-dev libssl-dev libtool pkg-config
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

diff --git a/.github/workflows/build_shared.yml b/.github/workflows/build_shared.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: actions/checkout@v3
     - name: Install build dependencies
       run: |
-        sudo apt-get -y install autoconf automake autopoint build-essential git libfuse-dev libssl-dev libtool pkg-config
+        sudo apt-get -y install autoconf automake autopoint build-essential git libssl-dev libtool pkg-config
     - name: Download test data
       run: |
         if test -x "synctestdata.sh"; then ./synctestdata.sh; fi

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 environment:
   nuget_token:
-    secure: l8kGPdWSs3RTcW6B+mgcT8ByCdVvXx6HbWPNd8nnqoUDhku8g507tpxla7LUPDOM
+    secure: xFlOodfYttki8HxA1hdhVhQ2lkVbj1EA1FxP9T1il2MUsBfH1rPEbTZy+etaMTD8
   PYPI_TOKEN:
     secure: VHuZiUWgTqTciKE2nsv/LoJHMGrPmIrGctOQjubAl40mTiBpfFZ5IkNK6SC8QArw9oIapIixKiV3Ku8S/wPvHWflI3FbCAWAfHdTw1Qg04g4AhLB3vd2kAj3mS94jzC39QQtxWA0HJp2uaXD5diXKp4a4Lzuzndy66+SgRUjUuKLrYy/8Ui8HgWaj/P26HzKpIy/m9VrNjHRpJl2xriXvuZ2+fYJu3lQ6NmQshxR0pUuEQmbaWRTwrKgG9sDIggkHEJTJ3okSqohLpRQ6phd1A==
   matrix:
@@ -310,7 +310,7 @@ install:
 - ps: If ($env:BUILD_ENVIRONMENT -eq "cygwin64") {
     (New-Object Net.WebClient).DownloadFile("https://cygwin.com/setup-x86_64.exe", "C:\\cygwin64\\setup-x86_64.exe") }
 - cmd: if [%BUILD_ENVIRONMENT%]==[cygwin64] (
-    C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P gettext-devel -P wget -P zlib-devel -P libssl-devel -P python3-devel )
+    C:\cygwin64\setup-x86_64.exe -qgnNdO -l C:\cygwin64\var\cache\setup -R c:\cygwin64 -s http://cygwin.mirror.constant.com -P cygfuse -P gettext-devel -P libssl-devel -P python3-devel -P wget -P zlib-devel )
 - cmd: if [%BUILD_ENVIRONMENT%]==[mingw-w64] (
     C:\msys64\usr\bin\pacman -S --noconfirm --needed autoconf automake gettext-devel libtool make mingw-w64-x86_64-gcc )
 - ps: If ( ( "cygwin64-gcc-no-optimization", "mingw-w64-gcc-no-optimization" ).Contains( $env:TARGET ) ) {

diff --git a/bdetools/mount_fuse.h b/bdetools/mount_fuse.h
@@ -25,6 +25,8 @@
 #include <common.h>
 #include <types.h>
 
+#if defined( HAVE_LIBFUSE ) || defined( HAVE_LIBOSXFUSE )
+
 /* Ensure FUSE_USE_VERSION is defined before including fuse.h
  */
 #if !defined( FUSE_USE_VERSION )
@@ -38,6 +40,8 @@
 #include <osxfuse/fuse.h>
 #endif
 
+#endif /* defined( HAVE_LIBFUSE ) || defined( HAVE_LIBOSXFUSE ) */
+
 #include "bdetools_libbde.h"
 #include "bdetools_libcerror.h"
 #include "mount_file_entry.h"

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.71])
 
 AC_INIT(
  [libbde],
- [20240411],
+ [20240413],
  [joachim.metz@gmail.com])
 
 AC_CONFIG_SRCDIR(

diff --git a/libbde.nuspec b/libbde.nuspec
@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>libbde</id>
-    <version>20240411</version>
+    <version>20240413</version>
     <authors>Joachim Metz</authors>
     <owners>joachimmetz</owners>
     <license type="expression">LGPL-3.0-or-later</license>
     <projectUrl>https://github.com/libyal/libbde</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <title>libbde</title>
     <description>Library to access the BitLocker Drive Encryption (BDE) format</description>
-    <releaseNotes>Release of libbde 20240411</releaseNotes>
+    <releaseNotes>Release of libbde 20240413</releaseNotes>
     <copyright>Copyright (C) 2011-2024</copyright>
     <tags>native</tags>
   </metadata>