diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 3672cc244..982896889 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -11,10 +11,12 @@ steps: - swift test --parallel -Xswiftc -DDISABLE_FOCUSED_EXAMPLES - label: "Danger" commands: - - echo "--- Build Danger" - - bazel build //tools:danger + - echo "--- Install Bundler" + - gem install bundler + - echo "--- Bundle Install" + - bundle install - echo "+++ Run Danger" - - ./bazel-bin/tools/danger --verbose + - bundle exec danger --verbose - label: "TSan Tests" commands: - echo "+++ Test" diff --git a/MODULE.bazel b/MODULE.bazel index 7f320f3ba..c9a66434f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -5,6 +5,7 @@ module( repo_name = "SwiftLint", ) +bazel_dep(name = "bazel_skylib", version = "1.4.1") bazel_dep(name = "platforms", version = "0.0.6") bazel_dep(name = "rules_apple", version = "2.2.0", repo_name = "build_bazel_rules_apple") bazel_dep(name = "rules_swift", version = "1.7.1", repo_name = "build_bazel_rules_swift") diff --git a/WORKSPACE b/WORKSPACE index 5d12dbc57..844d4efa2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,35 +1,5 @@ workspace(name = "SwiftLint") -load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository") - -git_repository( - name = "bazelruby_rules_ruby", - commit = "cc2f5ce961f7fa34557264dd05c7597e634f31e1", - remote = "https://github.com/bazelruby/rules_ruby.git", - shallow_since = "1679251731 -0700", -) - -load( - "@bazelruby_rules_ruby//ruby:deps.bzl", - "rules_ruby_dependencies", - "rules_ruby_select_sdk", -) - -rules_ruby_dependencies() - -rules_ruby_select_sdk(version = "host") - -load( - "@bazelruby_rules_ruby//ruby:defs.bzl", - "ruby_bundle", -) - -ruby_bundle( - name = "bundle", - gemfile = "//:Gemfile", - gemfile_lock = "//:Gemfile.lock", -) - load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( diff --git a/tools/BUILD b/tools/BUILD index 43e4812ca..32437d757 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -1,9 +1 @@ -load("@bazelruby_rules_ruby//ruby:defs.bzl", "ruby_binary") - exports_files(["test-analyze.sh"]) - -ruby_binary( - name = "danger", - main = "@bundle//:bin/danger", - deps = ["@bundle//:bin"], -)