Skip to content

Commit

Permalink
Try to upgrade appimage to bzlmod in a backward compatible manner
Browse files Browse the repository at this point in the history
  • Loading branch information
shabanzd authored and ziad-fernride committed Nov 26, 2023
1 parent 222c33d commit ccd7019
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module(name = "rules_appimage", version = "1.2.0")

bazel_dep(name = "bazel_skylib", version = "1.4.2")
bazel_dep(name = "rules_python", version = "0.25.0")
bazel_dep(name = "rules_cc", version = "0.0.8")
bazel_dep(name = "rules_cc", version = "0.0.9")
bazel_dep(name = "platforms", version = "0.0.7")

python = use_extension("@rules_python//python/extensions:python.bzl", "python")
Expand All @@ -17,6 +17,6 @@ pip.parse(
use_repo(pip, "rules_appimage_py_deps")

non_module_deps = use_extension("@rules_appimage//:deps.bzl", "non_module_deps")
use_repo(non_module_deps, "squashfs-tools", "zstd", "appimagetool.png", "appimage_runtime_aarch64", "appimage_runtime_armhf", "appimage_runtime_i686", "appimage_runtime_x86_64")
use_repo(non_module_deps, "squashfs-tools", "zstd", "appimagetool.png", "appimage_runtime_aarch64", "appimage_runtime_armhf", "appimage_runtime_i686", "appimage_runtime_x86_64", "appimage_runtime_i386", "appimage_runtime_armv7e-m")

# -- bazel_dep definitions -- #
register_toolchains("@rules_appimage//appimage:all")
2 changes: 1 addition & 1 deletion appimage/private/tool/mkappimage.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def _get_path_or_raise(path: str) -> Path:
runfiles = bazel_runfiles.Create()
if not runfiles:
raise FileNotFoundError("Could not find runfiles")
runfile = files.Rlocation(path)
runfile = runfiles.Rlocation(path)
if not runfile:
raise FileNotFoundError(f"Could not find {path} in runfiles")
return Path(runfile)
Expand Down

0 comments on commit ccd7019

Please sign in to comment.