Mirrors/mas
2
0
Fork 0
mirror of https://github.com/mas-cli/mas synced 2024-11-24 20:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into lint

Browse source
This commit is contained in:
Ben Chatelain 2021-05-12 16:54:52 -06:00 committed by GitHub
commit 59483ef34d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dangerfile
View file

@ -11,18 +11,12 @@
has_app_changes = !git.modified_files.grep(/Sources/).empty? has_app_changes = !git.modified_files.grep(/Sources/).empty?
has_test_changes = !git.modified_files.grep(/Tests/).empty? has_test_changes = !git.modified_files.grep(/Tests/).empty?
is_version_bump = git.modified_files.sort == [ # if has_app_changes && !has_test_changes
"Package.swift",
"MasKit/Package.swift"
].sort
message(":bookmark: Version bump!") if is_version_bump
# if has_app_changes && !has_test_changes && !is_version_bump
# warn("Tests were not updated", sticky: false) # warn("Tests were not updated", sticky: false)
# end # end
# Thanks other people! # 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 # Mainly to encourage writing up some reasoning about the PR, rather than just leaving a title
if github.pr_body.length < 5 if github.pr_body.length < 5

4
Package.resolved
View file

@ -33,8 +33,8 @@
"repositoryURL": "https://github.com/Quick/Nimble.git", "repositoryURL": "https://github.com/Quick/Nimble.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "d258c638d9ef214723a857a23f4113773aad28fb", "revision": "af1730dde4e6c0d45bf01b99f8a41713ce536790",
"version": "9.1.0" "version": "9.2.0"
} }
}, },
{ {

2
Package.swift
View file

@ -22,7 +22,7 @@ let package = Package(
dependencies: [ dependencies: [
// Dependencies declare other packages that this package depends on. // 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/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/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/PromiseKit.git", from: "6.13.3"),
.package(url: "https://github.com/mxcl/Version.git", from: "2.0.0"), .package(url: "https://github.com/mxcl/Version.git", from: "2.0.0"),

4
Tests/MasKitTests/Controllers/MasAppLibrarySpec.swift
View file

@ -35,8 +35,8 @@ public class MasAppLibrarySpec: QuickSpec {
let myApp = SoftwareProductMock( let myApp = SoftwareProductMock(
appName: "MyApp", appName: "MyApp",
bundleIdentifier: "com.example", bundleIdentifier: "com.example",
bundlePath: "", bundlePath: "/Applications/MyApp.app",
bundleVersion: "", bundleVersion: "1.0.0",
itemIdentifier: 1234 itemIdentifier: 1234
) )

2
script/test
View file

@ -7,4 +7,4 @@
# #
echo "==> ✅ Testing" echo "==> ✅ Testing"
swift test 2>&1 | xcpretty set -o pipefail && swift test 2>&1 | xcpretty