Skip to content
This repository has been archived by the owner on Apr 3, 2023. It is now read-only.

Commit

Permalink
Transitioned from_version to exact_version for integration tests. (
Browse files Browse the repository at this point in the history
…#131)

This will help avoid pulling in breaking changes from dependencies. However, breaking changes can occur if a dependency itself uses a "from" strategy for its versioning.
  • Loading branch information
cgrindel authored Mar 17, 2022
1 parent 0cbd681 commit b1d495f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 20 deletions.
4 changes: 3 additions & 1 deletion examples/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ bzlformat_pkg(name = "bzlformat")
ALL_OS_TEST_EXAMPLES = [
"simple",
"simple_revision",
"simple_with_binary",
# GH132: Disable test until the libswift_Concurrency.dylib error is
# addressed.
# "simple_with_binary",
"local_package",
"vapor",
"interesting_deps",
Expand Down
2 changes: 1 addition & 1 deletion examples/interesting_deps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ we must specify the correct package name in the `spm_pkg` declaration.
# Need to specify for the package because the URL basename does not
# match the package name in the Package.swift.
name = "libwebp",
from_version = "1.2.1",
exact_version = "1.2.1",
products = ["libwebp"],
url = "https://github.com/SDWebImage/libwebp-Xcode.git",
),
Expand Down
14 changes: 6 additions & 8 deletions examples/public_hdrs/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
workspace(name = "trustkit_with_dev_dir_example")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "cgrindel_rules_spm",
path = "../..",
Expand Down Expand Up @@ -42,19 +40,19 @@ spm_repositories(
name = "swift_pkgs",
dependencies = [
spm_pkg(
url = "https://github.com/datatheorem/TrustKit.git",
from_version = "2.0.0",
exact_version = "2.0.0",
products = ["TrustKitStatic"],
url = "https://github.com/datatheorem/TrustKit.git",
),
],
platforms = [
".iOS(.v13)",
".macOS(.v10_14)",
],
env = {
# If you are testing this locally, set this value to a valid Xcode
# path. This value is valid for the Github action runner host for
# macos-11.
# "DEVELOPER_DIR": "/Applications/Xcode_12.5.1.app",
},
platforms = [
".iOS(.v13)",
".macOS(.v10_14)",
],
)
4 changes: 2 additions & 2 deletions examples/simple_with_binary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spm_repositories(
dependencies = [
spm_pkg(
"https://github.com/apple/swift-log.git",
from_version = "1.0.0",
exact_version = "1.4.2",
products = ["Logging"],
),
],
Expand All @@ -26,7 +26,7 @@ spm_repositories(
dependencies = [
spm_pkg(
"https://github.com/realm/SwiftLint.git",
from_version = "0.0.0",
exact_version = "0.46.5",
products = ["swiftlint"],
),
],
Expand Down
8 changes: 3 additions & 5 deletions examples/simple_with_binary/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
workspace(name = "simple_with_binary_example")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "cgrindel_rules_spm",
path = "../..",
Expand Down Expand Up @@ -44,7 +42,7 @@ spm_repositories(
dependencies = [
spm_pkg(
"https://github.com/apple/swift-log.git",
from_version = "1.0.0",
exact_version = "1.4.2",
products = ["Logging"],
),
],
Expand All @@ -60,12 +58,12 @@ spm_repositories(
dependencies = [
spm_pkg(
"https://github.com/realm/SwiftLint.git",
from_version = "0.0.0",
exact_version = "0.46.5",
products = ["swiftlint"],
),
spm_pkg(
"https://github.com/nicklockwood/SwiftFormat.git",
from_version = "0.0.0",
exact_version = "0.49.6",
products = [
"swiftformat",
],
Expand Down
4 changes: 1 addition & 3 deletions examples/simple_with_dev_dir/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
workspace(name = "simple_with_dev_dir_example")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

local_repository(
name = "cgrindel_rules_spm",
path = "../..",
Expand Down Expand Up @@ -43,7 +41,7 @@ spm_repositories(
dependencies = [
spm_pkg(
"https://github.com/apple/swift-log.git",
from_version = "1.0.0",
exact_version = "1.4.2",
products = ["Logging"],
),
],
Expand Down

0 comments on commit b1d495f

Please sign in to comment.