Skip to content

Commit

Permalink
Merge pull request #12 from lemenkov/fix_gha
Browse files Browse the repository at this point in the history
Fix installation
  • Loading branch information
lemenkov authored Apr 19, 2024
2 parents 6086997 + ae62c2e commit 06c171d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ cpp ]
language: [ python ]

steps:
- name: Checkout
Expand All @@ -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
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
# 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:
runs-on: ubuntu-latest
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'
2 changes: 1 addition & 1 deletion erlang-find-requires.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 1 addition & 1 deletion testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)']

Expand Down

0 comments on commit 06c171d

Please sign in to comment.