diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index 5fb6f875f82..bc27ed44c18 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -27,19 +27,6 @@ http_archive( ], ) -http_archive( - name = "bazel_skylib", - sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d", - urls = [ - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz", - ], -) - -load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") - -bazel_skylib_workspace() - load("@ql//:defs.bzl", "ql_utils") ql_utils(name = "utils") diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel index f2a694e25e7..7219f98388c 100644 --- a/swift/BUILD.bazel +++ b/swift/BUILD.bazel @@ -1,8 +1,5 @@ load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files") -load("@rules_pkg//:install.bzl", "pkg_install") load("@ql//:defs.bzl", "codeql_platform") -load("@bazel_skylib//rules:native_binary.bzl", "native_binary") -load("@utils//:paths.bzl", "source_dir") pkg_files( name = "dbscheme", @@ -55,12 +52,3 @@ pkg_filegroup( ], visibility = ["//visibility:public"], ) - -pkg_install( - name = "install", - srcs = [":extractor-pack"], - args = [ - "--destdir", - source_dir() + "/extractor_pack", - ], -) diff --git a/swift/README.md b/swift/README.md index 60683e17e6f..e34138d0616 100644 --- a/swift/README.md +++ b/swift/README.md @@ -4,5 +4,5 @@ The Swift codeql package is an experimental and unsupported work in progress. ## Usage -Run `bazel run //swift:install-extractor`, which will install `swift/extractor_pack`. Using `--search-path=swift` will -then pick up the Swift extractor. +Run `bazel run //swift/install`, which will install `swift/extractor_pack`. Using `--search-path=swift` will then pick +up the Swift extractor. diff --git a/swift/install/BUILD.bazel b/swift/install/BUILD.bazel new file mode 100644 index 00000000000..b270fa8f79d --- /dev/null +++ b/swift/install/BUILD.bazel @@ -0,0 +1,11 @@ +load("@utils//:paths.bzl", "source_dir") +load("@rules_pkg//:install.bzl", "pkg_install") + +pkg_install( + name = "install", + srcs = ["//swift:extractor-pack"], + args = [ + "--destdir", + source_dir() + "/../extractor_pack", + ], +)