Skip to content

Commit

Permalink
Update presubmit.yml for bzlmod
Browse files Browse the repository at this point in the history
  • Loading branch information
luispadron committed Oct 24, 2023
1 parent 3091cd6 commit 8addeff
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 28 deletions.
18 changes: 6 additions & 12 deletions .bcr/presubmit.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
bcr_test_module:
module_path: "e2e/bzlmod"
matrix:
platform: ["macos"]
tasks:
build_flags:
- "--config=ios"
run_tests:
name: "Run test module"
platform: ${{ platform }}
build_targets:
- "//..."
tasks:
verify_build_targets:
name: Verify Build targets on macOS
platform: macos
build_targets:
- "@rules_ios//rules/..."
10 changes: 6 additions & 4 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@ jobs:
# Archive the repository
# Considerations:
# - Dont package hidden files (including the .git directory)
# - Dont package development files (vscode config, etc)
# - Dont package the bazel-* symlink directories
# - Dont package the tests directory
# - Dont package most of the tests directory
COPYFILE_DISABLE=1 tar czvf "rules_ios.$TAG.tar.gz" \
--exclude="./.*" \
--exclude="./.vscode" \
--exclude="./bazel-*" \
--exclude="./tests" \
--exclude="./tests/framework" \
--exclude="./tests/ios" \
--exclude="./tests/macos" \
./*
# Create the release notes
Expand Down
9 changes: 2 additions & 7 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,10 @@
load("@build_bazel_rules_swift//swift/internal:feature_names.bzl", "SWIFT_FEATURE_USE_GLOBAL_INDEX_STORE")
load("//rules:features.bzl", "feature_names")
load("@bazel_skylib//lib:selects.bzl", "selects")
load("@buildifier_prebuilt//:rules.bzl", "buildifier")

buildifier(
alias(
name = "buildifier",
exclude_patterns = [
"./.git/*",
"./bazel-*/*",
],
mode = "fix",
actual = "//tools:buildifier",
)

config_setting(
Expand Down
9 changes: 4 additions & 5 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ bazel_dep(
version = "1.13.0",
repo_name = "build_bazel_rules_swift",
)
bazel_dep(
name = "bazel_skylib",
version = "1.4.2",
)

# Declare the development dependencies needed for rules_ios development
bazel_dep(
Expand All @@ -48,11 +52,6 @@ bazel_dep(
version = "0.9.1",
dev_dependency = True,
)
bazel_dep(
name = "bazel_skylib",
version = "1.4.2",
dev_dependency = True,
)
bazel_dep(
name = "stardoc",
version = "0.6.2",
Expand Down
12 changes: 12 additions & 0 deletions tools/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
load("@buildifier_prebuilt//:rules.bzl", "buildifier")

buildifier(
name = "buildifier",
exclude_patterns = [
"./.git/*",
"./bazel-*/*",
],
mode = "fix",
tags = ["manual"],
visibility = ["//:__pkg__"],
)

0 comments on commit 8addeff

Please sign in to comment.