Skip to content

Commit 3352503

Browse files
authored
Merge pull request #411 from onekey-sec/test-python-3.11
Run tests on Python 3.11 as well
2 parents ce7245b + 4d30616 commit 3352503

File tree

6 files changed

+110
-68
lines changed

6 files changed

+110
-68
lines changed

.github/actions/setup-dependencies/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ runs:
77
using: "composite"
88
steps:
99
- name: Install 3rd party from apt
10-
run: sudo apt install e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lzop lziprecover img2simg libhyperscan-dev zstd
10+
run: sudo apt install e2fsprogs p7zip-full unar zlib1g-dev liblzo2-dev lzop lziprecover img2simg libhyperscan5 libhyperscan-dev zstd
1111
shell: bash
1212

1313
- name: Install sasquatch

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
strategy:
5454
matrix:
55-
python-version: ["3.8", "3.9", "3.10"]
55+
python-version: ["3.8", "3.9", "3.10", "3.11"]
5656
steps:
5757
- name: Checkout source code
5858
uses: actions/checkout@v2

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
2222
zlib1g-dev \
2323
libmagic1 \
2424
libhyperscan5 \
25+
libhyperscan-dev \
2526
zstd
2627
RUN curl -L -o sasquatch_1.0_amd64.deb https://github.com/onekey-sec/sasquatch/releases/download/sasquatch-v1.0/sasquatch_1.0_amd64.deb \
2728
&& dpkg -i sasquatch_1.0_amd64.deb \

default.nix

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
, lzo
1212
, lzop
1313
, p7zip
14+
, pkg-config
1415
, sasquatch
1516
, simg2img
1617
, unar
@@ -74,7 +75,16 @@ let
7475
hyperscan = super.hyperscan.overridePythonAttrs (_: {
7576
buildInputs = [
7677
hyperscan
78+
self.poetry
79+
self.setuptools
80+
];
81+
nativeBuildInputs = [
82+
pkg-config
7783
];
84+
85+
installPhase = ''
86+
${self.python.pythonForBuild.interpreter} -m pip install --no-build-isolation --no-index --prefix=$out --ignore-installed --no-dependencies --no-cache .
87+
'';
7888
});
7989

8090
arpy = overrideWithSetuptools super.arpy { };

0 commit comments

Comments
 (0)