Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Aug 8, 2024
1 parent 697b022 commit 6c102a2
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 15 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand All @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand All @@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config libfuse-dev
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config libfuse-dev
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand All @@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config libfuse3-dev
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config libfuse3-dev
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand All @@ -129,7 +129,7 @@ jobs:
run: |
sudo add-apt-repository universe &&
sudo apt-get update &&
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config python3-dev python-dev-is-python3
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config python3-dev python-dev-is-python3
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs:
run: |
sudo add-apt-repository universe &&
sudo apt-get update &&
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config python3-dev python-dev-is-python3
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config python3-dev python-dev-is-python3
- name: Building from source
env:
CC: ${{ matrix.compiler }}
Expand All @@ -186,7 +186,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/build_ossfuzz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Build OSSFuzz fuzz targets from source.
name: build_ossfuzz
on:
push:
branches: [main]
permissions: read-all
jobs:
build_ossfuzz:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
steps:
- name: Install build dependencies
run: |
sudo apt-get -y install git
- uses: actions/checkout@v4
with:
repository: google/oss-fuzz
path: oss-fuzz
- name: Build OSSFuzz fuzz targets
working-directory: oss-fuzz
run: |
mkdir -p projects/libvhdi
cp projects/libyal/build.sh projects/libvhdi/
cp projects/libyal/project.yaml projects/libvhdi/
head -n 20 projects/libyal/Dockerfile > projects/libvhdi/Dockerfile
echo "RUN git clone --depth 1 https://github.com/libyal/libvhdi.git libvhdi" >> projects/libvhdi/Dockerfile
tail -n 3 projects/libyal/Dockerfile >> projects/libvhdi/Dockerfile
python3 infra/helper.py build_image --pull libvhdi
python3 infra/helper.py build_fuzzers --sanitizer address libvhdi
python3 infra/helper.py check_build libvhdi
5 changes: 1 addition & 4 deletions .github/workflows/build_shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ jobs:
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-wide-character-type'
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential git libtool pkg-config
sudo apt-get -y install autoconf automake autopoint build-essential git libfuse3-dev libtool pkg-config
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@ install:
Else {
.\syncdokan.ps1 }
}
- ps: If (($env:BUILD_ENVIRONMENT -eq "msbuild") -And (Test-Path ".\synctestdata.ps1")) {
.\synctestdata.ps1 }
- sh: if ( test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode" ) && test -f "./synctestdata.sh"; then ./synctestdata.sh; fi
- cmd: if [%TARGET%]==[vs2010] (
pushd ..\dokan &&
set PYTHONPATH=..\vstools &&
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libvhdi],
[20240528],
[20240808],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down
3 changes: 2 additions & 1 deletion libvhdi.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ status: "alpha"
year_of_creation: "2012"
data_format: "Virtual Hard Disk (VHD) image"
documentation_url: "https://github.com/libyal/libvhdi/tree/main/documentation"
features: ["debug_output", "nuget"]
features: ["debug_output", "nuget", "ossfuzz", "python_bindings", "tools"]

[library]
description: "Library to access the Virtual Hard Disk (VHD) image format"
features: ["pthread", "wide_character_type"]
public_types: ["file"]

[tools]
Expand Down
4 changes: 2 additions & 2 deletions libvhdi.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package >
<metadata>
<id>libvhdi</id>
<version>20240528</version>
<version>20240808</version>
<authors>Joachim Metz</authors>
<owners>joachimmetz</owners>
<license type="expression">LGPL-3.0-or-later</license>
<projectUrl>https://github.com/libyal/libvhdi</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<title>libvhdi</title>
<description>Library to access the Virtual Hard Disk (VHD) image format</description>
<releaseNotes>Release of libvhdi 20240528</releaseNotes>
<releaseNotes>Release of libvhdi 20240808</releaseNotes>
<copyright>Copyright (C) 2012-2024</copyright>
<tags>native</tags>
</metadata>
Expand Down

0 comments on commit 6c102a2

Please sign in to comment.