diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 8662774..054536b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - language: [ cpp ] + language: [ python ] steps: - name: Checkout @@ -29,7 +29,7 @@ jobs: - name: Install Packages run: | sudo apt-get update - sudo apt-get install --yes erlang-nox python3-pybeam python-pyelftools python-rpm + sudo apt-get install --yes erlang-nox python3-pybeam python3-pyelftools python3-rpm - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index f4d8abc..06c5fdb 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -1,10 +1,7 @@ # Your .github/workflows/coverity.yml file. name: Coverity scan -# We only want to test official release code, not every pull request. -on: - push: - branches: [master] +on: [push, pull_request] jobs: coverity: @@ -12,8 +9,9 @@ jobs: steps: - uses: actions/checkout@v4 - run: sudo apt update - - run: sudo apt-get install --yes erlang-nox python3-pybeam python-pyelftools python-rpm + - run: sudo apt-get install --yes erlang-nox python3-pybeam python3-pyelftools python3-rpm - uses: vapier/coverity-scan-action@v1 with: email: ${{ secrets.COVERITY_SCAN_EMAIL }} token: ${{ secrets.COVERITY_SCAN_TOKEN }} + build_language: 'other' diff --git a/erlang-find-requires.py b/erlang-find-requires.py index bb70961..1c493d5 100755 --- a/erlang-find-requires.py +++ b/erlang-find-requires.py @@ -200,7 +200,7 @@ def inspect_so_library(library, export_name, dependency_name): ts = rpm.TransactionSet() mi = ts.dbMatch('providename', dependency_name) h = next(mi) - ds = dict(map(lambda x: x[0].split(" ")[1::2], h.dsFromHeader('providename'))) + ds = dict(map(lambda x: x[0].split(" ")[1::2], rpm.ds(h, "providename"))) if dependency_name in ds: f.close() return "%s = %s" % (dependency_name, ds[dependency_name]) diff --git a/testing.py b/testing.py index 4eee33b..9a6fba4 100644 --- a/testing.py +++ b/testing.py @@ -46,7 +46,7 @@ def test_check_for_target_cpu_macro(self): ts = rpm.TransactionSet() mi = ts.dbMatch('name', "erlang-erts") h = next(mi) - ds = dict(map(lambda x: x[0].split(" ")[1::2], h.dsFromHeader('providename'))) + ds = dict(map(lambda x: x[0].split(" ")[1::2], rpm.ds(h, "providename"))) ErlDrvDep = "erlang(erl_drv_version) = %s" % ds['erlang(erl_drv_version)'] ErlNifDep = "erlang(erl_nif_version) = %s" % ds['erlang(erl_nif_version)']