Skip to content

Commit 6fecb56

Browse files
Fixing hang tests for CI/CD.
1 parent 14e270b commit 6fecb56

File tree

6 files changed

+456
-336
lines changed

6 files changed

+456
-336
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ concurrency:
1717
group: ci
1818
cancel-in-progress: true
1919
jobs:
20-
macOS_5_4:
20+
SPM:
2121
name: Test macOS 11 (5.4)
2222
runs-on: macOS-11
2323
env:
2424
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
25-
timeout-minutes: 10
2625
strategy:
26+
fail-fast: false
27+
max-parallel: 2
2728
matrix:
2829
destination: ['OS=14.5,name=iPhone 12']
2930
steps:
@@ -35,7 +36,5 @@ jobs:
3536
# swift package update
3637
- name: Resolve dependencies
3738
run: swift package resolve
38-
- name: Build
39-
run: swift build --build-tests -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios13.0-simulator"
4039
- name: Test
41-
run: swift test --skip-build --parallel --list-tests
40+
run: swift test # --skip-build

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ let package = Package(
4343
name: "web3swiftTests",
4444
dependencies: ["web3swift"],
4545
resources: [
46-
.copy("../TestToken/Helpers/SafeMath/SafeMath.sol"),
47-
.copy("../TestToken/Helpers/TokenBasics/ERC20.sol"),
48-
.copy("../TestToken/Helpers/TokenBasics/IERC20.sol"),
49-
.copy("../TestToken/Token/Web3SwiftToken.sol")
46+
.copy("../../TestToken/Helpers/SafeMath/SafeMath.sol"),
47+
.copy("../../TestToken/Helpers/TokenBasics/ERC20.sol"),
48+
.copy("../../TestToken/Helpers/TokenBasics/IERC20.sol"),
49+
.copy("../../TestToken/Token/Web3SwiftToken.sol")
5050
]
5151
),
5252
]

Tests/web3swiftTests/infura_tests/web3swift_remoteParsing_Tests.swift

Lines changed: 111 additions & 0 deletions
Large diffs are not rendered by default.

Tests/web3swiftTests/local_tests/web3swift_basic_local_node_Tests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ class web3swift_basic_local_node_Tests: XCTestCase {
9494
XCTAssert(balanceBeforeFrom - (balanceAfterFrom + receipt.gasUsed * details.transaction.gasPrice) == valueToSend)
9595
}
9696

97+
// FIXME: Crashes on CI/CD
9798
func testSignPersonal() throws {
9899
let web3 = try Web3.new(URL.init(string: "http://127.0.0.1:8545")!)
99100
let allAddresses = try web3.eth.getAccounts()

0 commit comments

Comments
 (0)