Skip to content

Commit

Permalink
Remove drakrun deb and make whl instead (#844)
Browse files Browse the repository at this point in the history
  • Loading branch information
msm-cert authored Jan 26, 2024
1 parent 9e95446 commit 20d74a4
Show file tree
Hide file tree
Showing 15 changed files with 57 additions and 643 deletions.
29 changes: 9 additions & 20 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,35 +174,24 @@ jobs:
path: ./drakcore_*_amd64.deb
package_drakrun:
needs: [ package_drakvuf_bundle ]
strategy:
fail-fast: false
matrix:
include:
- distro: debian
version: buster
- distro: debian
version: bullseye
runs-on: ubuntu-latest
container: "${{ matrix.distro }}:${{matrix.version}}"
container: "python:3.8"
steps:
- uses: actions/checkout@v3
- name: Download draksetup compiled tools from artifacts
uses: actions/download-artifact@v3
with:
name: draksetup-tools-${{ matrix.distro }}-${{ matrix.version }}
name: draksetup-tools-debian-buster
path: drakrun/drakrun/tools
- name: Build drakrun
run: |
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y wget python3 python3-pip python3-venv dh-virtualenv debhelper devscripts
chmod +x drakrun/drakrun/tools/* # gh artifacts don't keep file permissions
cd drakrun
package/find-python.sh
dpkg-buildpackage -us -uc -b
python3 setup.py bdist_wheel
- uses: actions/upload-artifact@v3
with:
name: drakrun-debs-${{ matrix.distro }}-${{ matrix.version }}
path: ./drakrun_*_amd64.deb
name: drakrun-whl
path: ./drakrun/dist/drakrun-*.whl
test_e2e:
needs: [ package_drakcore, package_drakrun, package_drakvuf_bundle ]
strategy:
Expand All @@ -226,7 +215,7 @@ jobs:
- name: Download drakrun debs from artifacts
uses: actions/download-artifact@v3
with:
name: drakrun-debs-${{ matrix.distro }}-${{ matrix.version }}
name: drakrun-whl
path: /debs
- name: Download drakcore debs from artifacts
uses: actions/download-artifact@v3
Expand All @@ -248,7 +237,7 @@ jobs:
cd test
pip install -r requirements.txt
pytest -v --capture=no
python -m vm_runner_client destroy
python3 -m vm_runner_client destroy
env:
DRAKVUF_DEBS_PATH: "/debs"
BASE_IMAGE: "${{ matrix.distro }}-${{ matrix.version_number }}-generic-amd64"
Expand All @@ -264,7 +253,7 @@ jobs:
- name: Job failed - suspending VM (if possible)
if: ${{ failure() }}
run: |
python -m vm_runner_client suspend
python3 -m vm_runner_client suspend
env:
VM_RUNNER_API_URL: "http://127.0.0.1:8080"
VM_SUFFIX: "${{ matrix.distro }}-${{ matrix.version_number }}"
3 changes: 3 additions & 0 deletions drakrun/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
include drakrun/cfg.template
include drakrun/tools/*
include drakrun/test/*
include drakrun/config.dist.ini
include drakrun/hooks.dist.txt
include drakrun/systemd/[email protected]
63 changes: 0 additions & 63 deletions drakrun/debian/changelog

This file was deleted.

1 change: 0 additions & 1 deletion drakrun/debian/compat

This file was deleted.

Loading

0 comments on commit 20d74a4

Please sign in to comment.