From 1c5d8c39ad03bc375bb820c555ff87ab3fbb9968 Mon Sep 17 00:00:00 2001 From: Aryan Rajoria Date: Wed, 6 Nov 2024 01:04:12 +0100 Subject: [PATCH] working changes added to both vcpkg and meson Signed-off-by: Aryan Rajoria --- .github/workflows/build-meson.yml | 7 +------ .github/workflows/build-vcpkg.yml | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-meson.yml b/.github/workflows/build-meson.yml index d2e31f2..7ce1159 100644 --- a/.github/workflows/build-meson.yml +++ b/.github/workflows/build-meson.yml @@ -10,8 +10,7 @@ env: jobs: builder-meson: - # runs-on: ['self-hosted', 'ubuntu', 'x64'] - runs-on: ubuntu-latest + runs-on: ['self-hosted', 'ubuntu', 'arm64'] permissions: contents: write packages: write @@ -20,10 +19,6 @@ jobs: with: repository: AppThreat/blint-db path: blint-db - # - name: Setup Ninja - # uses: ashutoshvarma/setup-ninja@master - # with: - # version: 1.10.0 - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.github/workflows/build-vcpkg.yml b/.github/workflows/build-vcpkg.yml index f205242..19f884d 100644 --- a/.github/workflows/build-vcpkg.yml +++ b/.github/workflows/build-vcpkg.yml @@ -19,10 +19,6 @@ jobs: with: repository: AppThreat/blint-db path: blint-db - - name: Setup Ninja - uses: ashutoshvarma/setup-ninja@master - with: - version: 1.10.0 - name: Set up Python uses: actions/setup-python@v5 with: @@ -32,9 +28,21 @@ jobs: python -m pip install --upgrade pip pip install setuptools wheel twine build cd blint-db && python -m pip install . + - name: Install apt package + run: | + sudo apt clean && sudo apt update + sudo apt install libzmq3-dev libx11-dev qtbase5-dev libgl1-mesa-dev ninja-build file -y + - name: Install ORAS + run: | + curl -LO "https://github.com/oras-project/oras/releases/download/v1.2.0/oras_1.2.0_linux_amd64.tar.gz" + mkdir -p oras-install/ + tar -zxf oras_1.2.0_*.tar.gz -C oras-install/ + sudo mv oras-install/oras /usr/local/bin/ + rm -rf oras_1.2.0_*.tar.gz oras-install/ + sudo chmod +x /usr/local/bin/oras - name: Build and upload db run: | - mkdir temp + mkdir -p temp python blint-db/blint_db/cli.py -Z2 echo $GITHUB_TOKEN | oras login ghcr.io -u $GITHUB_USERNAME --password-stdin cd blint-db