mirror of
https://github.com/mas-cli/mas
synced 2024-11-21 19:23:01 +00:00
Merge branch 'main' into lint
This commit is contained in:
commit
59483ef34d
5 changed files with 8 additions and 14 deletions
10
Dangerfile
10
Dangerfile
|
@ -11,18 +11,12 @@
|
|||
has_app_changes = !git.modified_files.grep(/Sources/).empty?
|
||||
has_test_changes = !git.modified_files.grep(/Tests/).empty?
|
||||
|
||||
is_version_bump = git.modified_files.sort == [
|
||||
"Package.swift",
|
||||
"MasKit/Package.swift"
|
||||
].sort
|
||||
message(":bookmark: Version bump!") if is_version_bump
|
||||
|
||||
# if has_app_changes && !has_test_changes && !is_version_bump
|
||||
# if has_app_changes && !has_test_changes
|
||||
# warn("Tests were not updated", sticky: false)
|
||||
# end
|
||||
|
||||
# Thanks other people!
|
||||
message(":tada:") if is_version_bump && github.pr_author != "phatblat"
|
||||
message(":tada:") if github.pr_author != "phatblat"
|
||||
|
||||
# Mainly to encourage writing up some reasoning about the PR, rather than just leaving a title
|
||||
if github.pr_body.length < 5
|
||||
|
|
|
@ -33,8 +33,8 @@
|
|||
"repositoryURL": "https://github.com/Quick/Nimble.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "d258c638d9ef214723a857a23f4113773aad28fb",
|
||||
"version": "9.1.0"
|
||||
"revision": "af1730dde4e6c0d45bf01b99f8a41713ce536790",
|
||||
"version": "9.2.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -22,7 +22,7 @@ let package = Package(
|
|||
dependencies: [
|
||||
// Dependencies declare other packages that this package depends on.
|
||||
.package(url: "https://github.com/Carthage/Commandant.git", from: "0.18.0"),
|
||||
.package(url: "https://github.com/Quick/Nimble.git", from: "9.1.0"),
|
||||
.package(url: "https://github.com/Quick/Nimble.git", from: "9.2.0"),
|
||||
.package(url: "https://github.com/Quick/Quick.git", from: "4.0.0"),
|
||||
.package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.13.3"),
|
||||
.package(url: "https://github.com/mxcl/Version.git", from: "2.0.0"),
|
||||
|
|
|
@ -35,8 +35,8 @@ public class MasAppLibrarySpec: QuickSpec {
|
|||
let myApp = SoftwareProductMock(
|
||||
appName: "MyApp",
|
||||
bundleIdentifier: "com.example",
|
||||
bundlePath: "",
|
||||
bundleVersion: "",
|
||||
bundlePath: "/Applications/MyApp.app",
|
||||
bundleVersion: "1.0.0",
|
||||
itemIdentifier: 1234
|
||||
)
|
||||
|
||||
|
|
|
@ -7,4 +7,4 @@
|
|||
#
|
||||
|
||||
echo "==> ✅ Testing"
|
||||
swift test 2>&1 | xcpretty
|
||||
set -o pipefail && swift test 2>&1 | xcpretty
|
||||
|
|
Loading…
Reference in a new issue