Skip to content

Commit

Permalink
Changes for CI tests (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Apr 10, 2023
1 parent b0c0c52 commit 227f271
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 24 deletions.
16 changes: 8 additions & 8 deletions appveyor.yml
@@ -1,16 +1,16 @@
environment:
matrix:
- DESCRIPTION: "Windows with 32-bit Python 3.10"
- DESCRIPTION: "Windows with 32-bit Python 3.11"
MACHINE_TYPE: "x86"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PYTHON: "C:\\Python310"
PYTHON_VERSION: "3.10"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
PYTHON: "C:\\Python311"
PYTHON_VERSION: "3.11"
L2TBINARIES_TRACK: "dev"
- DESCRIPTION: "Windows with 64-bit Python 3.10"
- DESCRIPTION: "Windows with 64-bit Python 3.11"
MACHINE_TYPE: "amd64"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PYTHON: "C:\\Python310-x64"
PYTHON_VERSION: "3.10"
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
PYTHON: "C:\\Python311-x64"
PYTHON_VERSION: "3.11"
L2TBINARIES_TRACK: "dev"
- DESCRIPTION: "Mac OS with Python 3.11"
APPVEYOR_BUILD_WORKER_IMAGE: macos-monterey
Expand Down
34 changes: 19 additions & 15 deletions config/appveyor/install.ps1
@@ -1,23 +1,27 @@
# Script to set up tests on AppVeyor Windows.

$Dependencies = "PyYAML artifacts cffi cryptography dfdatetime dfimagetools dfvfs dfwinreg dtfabric idna libbde libcreg libewf libexe libfsapfs libfsext libfsfat libfshfs libfsntfs libfsxfs libfvde libfwnt libluksde libmodi libphdi libqcow libregf libsigscan libsmdev libsmraw libvhdi libvmdk libvsgpt libvshadow libvslvm libwrc pytsk3 xattr"
$Dependencies = ${Dependencies} -split " "

$Output = Invoke-Expression -Command "git clone https://github.com/log2timeline/l2tdevtools.git ..\l2tdevtools 2>&1"
Write-Host (${Output} | Out-String)

If ($env:APPVEYOR_REPO_BRANCH -eq "main")
{
$Track = "stable"
}
Else
If ($Dependencies.Length -gt 0)
{
$Track = $env:APPVEYOR_REPO_BRANCH
}
New-Item -ItemType "directory" -Name "dependencies"
$Dependencies = ${Dependencies} -split " "

$env:PYTHONPATH = "..\l2tdevtools"
$Output = Invoke-Expression -Command "git clone https://github.com/log2timeline/l2tdevtools.git ..\l2tdevtools 2>&1 | %{ '$_' }"
Write-Host (${Output} | Out-String)

$Output = Invoke-Expression -Command "& '${env:PYTHON}\python.exe' ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type ${env:MACHINE_TYPE} --msi-targetdir ${env:PYTHON} --track ${env:L2TBINARIES_TRACK} ${Dependencies} 2>&1"
Write-Host (${Output} | Out-String)
If ($env:APPVEYOR_REPO_BRANCH -eq "main")
{
$Track = "stable"
}
Else
{
$Track = $env:APPVEYOR_REPO_BRANCH
}
New-Item -ItemType "directory" -Name "dependencies"

$env:PYTHONPATH = "..\l2tdevtools"

$Output = Invoke-Expression -Command "& '${env:PYTHON}\python.exe' ..\l2tdevtools\tools\update.py --download-directory dependencies --machine-type ${env:MACHINE_TYPE} --msi-targetdir ${env:PYTHON} --track ${env:L2TBINARIES_TRACK} ${Dependencies} 2>&1"
Write-Host (${Output} | Out-String)
}

2 changes: 1 addition & 1 deletion requirements.txt
Expand Up @@ -35,4 +35,4 @@ libvshadow-python >= 20160109
libvslvm-python >= 20160109
libwrc-python >= 20220104
pytsk3 >= 20210419
pyxattr >= 0.7.2
pyxattr >= 0.7.2 ; platform_system != "Windows"

0 comments on commit 227f271

Please sign in to comment.