Skip to content

Commit

Permalink
Fix/vanessa is an idiot wait thats not fixable (#7)
Browse files Browse the repository at this point in the history
* vanessa is an idiot bug fix
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Dec 17, 2021
1 parent 0689771 commit a1814dc
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
The versions coincide with releases on pip. Only major versions will be released as tags on Github.

## [0.0.x](https://github.com/buildsi/spliced/tree/main) (0.0.x)
- abicompat is missing the binary as the first argument! (0.0.13)
- Mock splice missing install of splice and replace (0.0.12)
- Support for mock splice with spack (0.0.11)
- Initial creation of project (0.0.1)
Expand Down
6 changes: 5 additions & 1 deletion action/artifacts/scripts/get_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,11 @@ def download_artifacts(artifacts, output, days):
# Loop through files, add those that aren't present
for filename in recursive_find(tmp):

data = read_json(filename)
try:
data = read_json(filename)
except:
print("%s is not valid json, cannot parse." % filename)
continue

# We can load any valid result (does not need to have predictions)
try:
Expand Down
9 changes: 7 additions & 2 deletions spliced/predict/libabigail.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ def splice_different_libs(self, splice, original_libs, replace_libs):
for replace_lib in replace_libs:

# Run abicompat to make a prediction
command = "%s %s %s" % (self.abicompat, original_lib, replace_lib)
command = "%s %s %s %s" % (
self.abicompat,
binary,
original_lib,
replace_lib,
)
res = utils.run_command(command)

# Additional debugging
Expand Down Expand Up @@ -173,7 +178,7 @@ def splice_equivalent_libs(self, splice, libs):

# Run abicompat to make a prediction
res = utils.run_command(
"%s %s %s" % (self.abicompat, original, lib)
"%s %s %s %s" % (self.abicompat, binary, original, lib)
)
res["binary"] = binary
res["splice_type"] = "same_lib"
Expand Down
2 changes: 1 addition & 1 deletion spliced/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# SPDX-License-Identifier: (Apache-2.0 OR MIT)

__version__ = "0.0.12"
__version__ = "0.0.13"
AUTHOR = "Vanessa Sochat"
NAME = "spliced"
PACKAGE_URL = "https://github.com/buildsi/spliced"
Expand Down

0 comments on commit a1814dc

Please sign in to comment.