dnrops
/
carton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version to 0.11.0, update dependencies (#251) 

* Bump version to 0.11.0, update dependencies

* Test on Big Sur with Xcode 12.5

* Update test fixture dependencies

* Remove `LinuxMain.swift` expectations

* Test with `wasm-5.4-SNAPSHOT-2021-08-26-a`

* Remove expectations for `XCTestManifests.swift`

* Enable debugging output

* Try the latest 5.4 toolchain

* print debug output

* More debug output

* Test on macOS 11 with Xcode 13

* Pipe errors to stdout

* Update DefaultToolchain.swift

* Revert "Update DefaultToolchain.swift"

This reverts commit 4ff15f938a.

* Remove Xcode 13 from the CI matrix

* Update DefaultToolchain.swift

* Reduce the diff
This commit is contained in:
Max Desiatov 2021-09-01 15:07:00 +01:00 committed by GitHub
parent 1c9502e833
commit dd6439700f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 61 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/swift.yml vendored
View File

@ -17,12 +17,12 @@ jobs:
- os: macos-10.15 - os: macos-10.15
swift_version: 5.3 swift_version: 5.3
xcode: /Applications/Xcode_12.app/Contents/Developer xcode: /Applications/Xcode_12.app/Contents/Developer
# - os: macos-11.0 - os: macos-11
# swift_version: 5.2 swift_version: 5.4
# xcode: /Applications/Xcode_11.7.app/Contents/Developer xcode: /Applications/Xcode_12.5.app/Contents/Developer
# - os: macos-11.0 # - os: macos-11
# swift_version: 5.3 # swift_version: 5.5
# xcode: /Applications/Xcode_12.2.app/Contents/Developer # xcode: /Applications/Xcode_13.0.app/Contents/Developer
- os: ubuntu-18.04 - os: ubuntu-18.04
swift_version: 5.4 swift_version: 5.4
- os: ubuntu-20.04 - os: ubuntu-20.04

2
Package.swift
View File

@ -35,7 +35,7 @@ let package = Package(
url: "https://github.com/apple/swift-tools-support-core.git", url: "https://github.com/apple/swift-tools-support-core.git",
.branch("release/5.4") .branch("release/5.4")
), ),
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.10.0"), .package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.12.0"),
.package(url: "https://github.com/vapor/vapor.git", from: "4.29.3"), .package(url: "https://github.com/vapor/vapor.git", from: "4.29.3"),
.package(url: "https://github.com/apple/swift-crypto.git", from: "1.1.0"), .package(url: "https://github.com/apple/swift-crypto.git", from: "1.1.0"),
.package(url: "https://github.com/JohnSundell/Splash.git", from: "0.14.0"), .package(url: "https://github.com/JohnSundell/Splash.git", from: "0.14.0"),

2
Sources/CartonHelpers/DefaultToolchain.swift
View File

@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
public let defaultToolchainVersion = "wasm-5.3.1-RELEASE" public let defaultToolchainVersion = "wasm-5.4.0-RELEASE"

2
Sources/CartonHelpers/Version.swift
View File

@ -12,4 +12,4 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
public let cartonVersion = "0.10.0" public let cartonVersion = "0.11.0"

2
Sources/CartonKit/Model/Template.swift
View File

@ -179,7 +179,7 @@ extension Templates {
.init( .init(
name: "Tokamak", name: "Tokamak",
url: "https://github.com/TokamakUI/Tokamak", url: "https://github.com/TokamakUI/Tokamak",
version: .from("0.7.0") version: .from("0.8.0")
), ),
], ],
targetDepencencies: [ targetDepencencies: [

3
Tests/CartonCommandTests/BundleCommandTests.swift
View File

@ -37,7 +37,8 @@ final class BundleCommandTests: XCTestCase {
AssertExecuteCommand( AssertExecuteCommand(
command: "carton bundle", command: "carton bundle",
cwd: packageDirectory.url cwd: packageDirectory.url,
debug: true
) )
// Confirm that the files are actually in the folder // Confirm that the files are actually in the folder

2
Tests/CartonCommandTests/DevCommandTests.swift
View File

@ -45,6 +45,7 @@ final class DevCommandTests: XCTestCase {
guard let process = executeCommand( guard let process = executeCommand(
command: "carton dev --verbose", command: "carton dev --verbose",
shouldPrintOutput: true,
cwd: packageDirectory.url cwd: packageDirectory.url
) else { ) else {
XCTFail("Could not create process") XCTFail("Could not create process")
@ -73,6 +74,7 @@ final class DevCommandTests: XCTestCase {
guard let process = executeCommand( guard let process = executeCommand(
command: "carton dev --verbose --port 8081 --host 0.0.0.0", command: "carton dev --verbose --port 8081 --host 0.0.0.0",
shouldPrintOutput: true,
cwd: packageDirectory.url cwd: packageDirectory.url
) else { ) else {
XCTFail("Could not create process") XCTFail("Could not create process")

16
Tests/CartonCommandTests/InitCommandTests.swift
View File

@ -53,10 +53,6 @@ final class InitCommandTests: XCTestCase {
"Sources/\(package)/main.swift does not exist" "Sources/\(package)/main.swift does not exist"
) )
XCTAssertTrue(packageDirectory.ls().contains("Tests"), "Tests does not exist") XCTAssertTrue(packageDirectory.ls().contains("Tests"), "Tests does not exist")
XCTAssertTrue(
packageDirectory.ls().contains("Tests/LinuxMain.swift"),
"Tests/LinuxMain.swift does not exist"
)
XCTAssertTrue( XCTAssertTrue(
packageDirectory.ls().contains("Tests/\(package)Tests"), packageDirectory.ls().contains("Tests/\(package)Tests"),
"Tests/\(package)Tests does not exist" "Tests/\(package)Tests does not exist"
@ -65,10 +61,6 @@ final class InitCommandTests: XCTestCase {
packageDirectory.ls().contains("Tests/\(package)Tests/\(package)Tests.swift"), packageDirectory.ls().contains("Tests/\(package)Tests/\(package)Tests.swift"),
"Tests/\(package)Tests/\(package)Tests.swift does not exist" "Tests/\(package)Tests/\(package)Tests.swift does not exist"
) )
XCTAssertTrue(
packageDirectory.ls().contains("Tests/\(package)Tests/XCTestManifests.swift"),
"Tests/\(package)Tests/XCTestManifests.swift does not exist"
)
// finally, clean up // finally, clean up
try packageDirectory.delete() try packageDirectory.delete()
@ -105,10 +97,6 @@ final class InitCommandTests: XCTestCase {
"Sources/\(package)/main.swift does not exist" "Sources/\(package)/main.swift does not exist"
) )
XCTAssertTrue(packageDirectory.ls().contains("Tests"), "Tests does not exist") XCTAssertTrue(packageDirectory.ls().contains("Tests"), "Tests does not exist")
XCTAssertTrue(
packageDirectory.ls().contains("Tests/LinuxMain.swift"),
"Tests/LinuxMain.swift does not exist"
)
XCTAssertTrue( XCTAssertTrue(
packageDirectory.ls().contains("Tests/\(package)Tests"), packageDirectory.ls().contains("Tests/\(package)Tests"),
"Tests/\(package)Tests does not exist" "Tests/\(package)Tests does not exist"
@ -117,10 +105,6 @@ final class InitCommandTests: XCTestCase {
packageDirectory.ls().contains("Tests/\(package)Tests/\(package)Tests.swift"), packageDirectory.ls().contains("Tests/\(package)Tests/\(package)Tests.swift"),
"Tests/\(package)Tests/\(package)Tests.swift does not exist" "Tests/\(package)Tests/\(package)Tests.swift does not exist"
) )
XCTAssertTrue(
packageDirectory.ls().contains("Tests/\(package)Tests/XCTestManifests.swift"),
"Tests/\(package)Tests/XCTestManifests.swift does not exist"
)
let actualTemplateSource = try String(contentsOfFile: packageDirectory let actualTemplateSource = try String(contentsOfFile: packageDirectory
.appending(components: "Sources", package, "main.swift").pathString) .appending(components: "Sources", package, "main.swift").pathString)

4
Tests/CartonCommandTests/SDKCommandTests.swift
View File

@ -72,14 +72,14 @@ final class SDKCommandTests: XCTestCase {
// it's ok if there is nothing to delete // it's ok if there is nothing to delete
do { try swiftVersion.delete() } catch {} do { try swiftVersion.delete() } catch {}
let alternateLocal = "wasm-5.3.1" let alternateLocal = "wasm-5.4.0"
try alternateLocal.write(to: swiftVersion.url, atomically: true, encoding: .utf8) try alternateLocal.write(to: swiftVersion.url, atomically: true, encoding: .utf8)
AssertExecuteCommand( AssertExecuteCommand(
command: "carton sdk local", command: "carton sdk local",
cwd: packageDirectory.url, cwd: packageDirectory.url,
expected: "wasm-5.3.1", expected: "wasm-5.4.0",
expectedContains: true expectedContains: true
) )

35
Tests/Fixtures/Milk/Package.resolved
View File

@ -6,17 +6,17 @@
"repositoryURL": "https://github.com/swiftwasm/JavaScriptKit.git", "repositoryURL": "https://github.com/swiftwasm/JavaScriptKit.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "b7a02434c6e973c08c3fd5069105ef44dd82b891", "revision": "b19e7c8b10a2750ed47753e31ed13613171f3294",
"version": "0.9.0" "version": "0.10.1"
} }
}, },
{ {
"package": "OpenCombine", "package": "OpenCombine",
"repositoryURL": "https://github.com/TokamakUI/OpenCombine.git", "repositoryURL": "https://github.com/OpenCombine/OpenCombine.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "bccff3e7c84bc559e1aa0aa9ca878400360d439d", "revision": "28993ae57de5a4ea7e164787636cafad442d568c",
"version": "0.12.0-alpha2" "version": "0.12.0"
} }
}, },
{ {
@ -24,17 +24,26 @@
"repositoryURL": "https://github.com/swiftwasm/OpenCombineJS.git", "repositoryURL": "https://github.com/swiftwasm/OpenCombineJS.git",
"state": { "state": {
"branch": null, "branch": null,
"revision": "b346f955ed21ab44576e204a7554210c77f69b9b", "revision": "eaf324ce78710f53b52fb82e9a8de4693633e33a",
"version": "0.0.1" "version": "0.1.1"
} }
}, },
{ {
"package": "Runtime", "package": "swift-argument-parser",
"repositoryURL": "https://github.com/MaxDesiatov/Runtime.git", "repositoryURL": "https://github.com/apple/swift-argument-parser",
"state": { "state": {
"branch": null, "branch": null,
"revision": "a617ead8a125a97e69d6100e4d27922006e82e0a", "revision": "83b23d940471b313427da226196661856f6ba3e0",
"version": "2.1.2" "version": "0.4.4"
}
},
{
"package": "Benchmark",
"repositoryURL": "https://github.com/google/swift-benchmark",
"state": {
"branch": null,
"revision": "8e0ef8bb7482ab97dcd2cd1d6855bd38921c345d",
"version": "0.1.0"
} }
}, },
{ {
@ -42,8 +51,8 @@
"repositoryURL": "https://github.com/TokamakUI/Tokamak", "repositoryURL": "https://github.com/TokamakUI/Tokamak",
"state": { "state": {
"branch": null, "branch": null,
"revision": "b4b0efca4de0ce9cff771649dfbcd13c5736e7f0", "revision": "c2ed28ca40445b1b63bfdfe45de2507e5eb24a21",
"version": "0.6.1" "version": "0.8.0"
} }
} }
] ]

2
Tests/Fixtures/Milk/Package.swift
View File

@ -7,7 +7,7 @@ let package = Package(
.executable(name: "Milk", targets: ["Milk"]), .executable(name: "Milk", targets: ["Milk"]),
], ],
dependencies: [ dependencies: [
.package(name: "Tokamak", url: "https://github.com/TokamakUI/Tokamak", from: "0.6.1"), .package(name: "Tokamak", url: "https://github.com/TokamakUI/Tokamak", from: "0.8.0"),
], ],
targets: [ targets: [
.target( .target(

35
package-lock.json generated
View File

@ -1,19 +1,19 @@
{ {
"name": "carton", "name": "carton",
"version": "0.10.0", "version": "0.11.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.10.0", "version": "0.11.0",
"license": "Apache-2.0", "license": "Apache-2.0",
"devDependencies": { "devDependencies": {
"@wasmer/wasi": "^0.12.0", "@wasmer/wasi": "^0.12.0",
"@wasmer/wasmfs": "^0.12.0", "@wasmer/wasmfs": "^0.12.0",
"javascript-kit-swift": "^0.9.0", "javascript-kit-swift": "^0.10.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"reconnecting-websocket": "^4.4.0", "reconnecting-websocket": "^4.4.0",
"webpack": "^4.44.1", "webpack": "^4.46.0",
"webpack-cli": "^3.3.12" "webpack-cli": "^3.3.12"
} }
}, },
@ -2725,10 +2725,11 @@
} }
}, },
"node_modules/javascript-kit-swift": { "node_modules/javascript-kit-swift": {
"version": "0.9.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/javascript-kit-swift/-/javascript-kit-swift-0.9.0.tgz", "resolved": "https://registry.npmjs.org/javascript-kit-swift/-/javascript-kit-swift-0.10.1.tgz",
"integrity": "sha512-yJ5xh9fK/CCfVQ4oKvgWV3x8DSeixtOMru4G9VvZlfATndChCa8ulFKVH2oEkloIfLW6mdszP4vI7WASjXig3g==", "integrity": "sha512-zGBl04b499wZdW9U6kWPOC3DYfl32z9my7QXUzrCem+akUpTFpe6KCCtANCSuCtqpcSAaK5YDWPOHuQDa0zg/Q==",
"dev": true "dev": true,
"license": "MIT"
}, },
"node_modules/json-parse-better-errors": { "node_modules/json-parse-better-errors": {
"version": "1.0.2", "version": "1.0.2",
@ -3578,9 +3579,9 @@
} }
}, },
"node_modules/path-parse": { "node_modules/path-parse": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"dev": true "dev": true
}, },
"node_modules/path-type": { "node_modules/path-type": {
@ -7839,9 +7840,9 @@
"dev": true "dev": true
}, },
"javascript-kit-swift": { "javascript-kit-swift": {
"version": "0.9.0", "version": "0.10.1",
"resolved": "https://registry.npmjs.org/javascript-kit-swift/-/javascript-kit-swift-0.9.0.tgz", "resolved": "https://registry.npmjs.org/javascript-kit-swift/-/javascript-kit-swift-0.10.1.tgz",
"integrity": "sha512-yJ5xh9fK/CCfVQ4oKvgWV3x8DSeixtOMru4G9VvZlfATndChCa8ulFKVH2oEkloIfLW6mdszP4vI7WASjXig3g==", "integrity": "sha512-zGBl04b499wZdW9U6kWPOC3DYfl32z9my7QXUzrCem+akUpTFpe6KCCtANCSuCtqpcSAaK5YDWPOHuQDa0zg/Q==",
"dev": true "dev": true
}, },
"json-parse-better-errors": { "json-parse-better-errors": {
@ -8569,9 +8570,9 @@
"dev": true "dev": true
}, },
"path-parse": { "path-parse": {
"version": "1.0.6", "version": "1.0.7",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
"dev": true "dev": true
}, },
"path-type": { "path-type": {

8
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "carton", "name": "carton",
"version": "0.10.0", "version": "0.11.0",
"description": "📦 Watcher, bundler, and test runner for your SwiftWasm apps ", "description": "📦 Watcher, bundler, and test runner for your SwiftWasm apps ",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
@ -28,10 +28,10 @@
"devDependencies": { "devDependencies": {
"@wasmer/wasi": "^0.12.0", "@wasmer/wasi": "^0.12.0",
"@wasmer/wasmfs": "^0.12.0", "@wasmer/wasmfs": "^0.12.0",
"javascript-kit-swift": "^0.9.0", "javascript-kit-swift": "^0.10.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"reconnecting-websocket": "^4.4.0", "reconnecting-websocket": "^4.4.0",
"webpack": "^4.44.1", "webpack": "^4.46.0",
"webpack-cli": "^3.3.12" "webpack-cli": "^3.3.12"
} }
} }