Skip to content

Commit b6abf2e

Browse files
Merge pull request #500 from skywinder/develop
2 parents ff538e8 + 239887d commit b6abf2e

File tree

2,138 files changed

+1223
-413598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,138 files changed

+1223
-413598
lines changed

.github/workflows/ci.yml

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ jobs:
2323
spm:
2424
name: Swift Package Manager 5.4
2525
runs-on: macOS-11
26-
concurrency: spm
26+
concurrency:
27+
group: spm-${{ github.run_id }}
28+
cancel-in-progress: false
2729
env:
2830
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
2931
steps:
@@ -32,12 +34,22 @@ jobs:
3234
run: swift package resolve
3335
- name: Build
3436
run: swift build --build-tests
35-
# - name: Run local tests
36-
# run: swift test --skip-build -c debug --filter localTests
37+
- name: Install ganache
38+
run: npm install ganache --global
39+
- name: Start ganache in background
40+
run: ganache &
41+
- name: Wait till ganache starts
42+
run: sleep 1
43+
- name: Run local tests
44+
run: swift test --skip-build -c debug --filter localTests
45+
# - name: Run remote tests
46+
# run: swift test --skip-build -c debug --filter remoteTests
3747
carthage:
3848
name: Carthage
3949
runs-on: macOS-11
40-
concurrency: carthage
50+
concurrency:
51+
group: carthage-${{ github.run_id }}
52+
cancel-in-progress: false
4153
env:
4254
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
4355
strategy:
@@ -53,5 +65,13 @@ jobs:
5365
run: carthage build --no-use-binaries --platform iOS Simulator --use-xcframeworks
5466
- name: Building framework
5567
run: xcodebuild build-for-testing -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
56-
# - name: Running local tests
57-
# run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
68+
- name: Install ganache
69+
run: npm install ganache --global
70+
- name: Start ganache in background
71+
run: ganache &
72+
- name: Wait till ganache starts
73+
run: sleep 1
74+
- name: Run local tests
75+
run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
76+
# - name: Run remote tests
77+
# run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan RemoteTests

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,13 @@ Package.pins
4747
# you should judge for yourself, the pros and cons are mentioned at:
4848
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
4949
#
50-
# Pods/
51-
# Example/web3swiftBrowser/Pods
50+
Example/**/Pods
5251

5352
# Carthage
5453
#
5554
# Add this line if you want to avoid checking in source code from Carthage dependencies.
56-
# Carthage/Checkouts
57-
58-
#Carthage/Build
55+
Carthage/Checkouts
56+
Carthage/Build
5957

6058
# fastlane
6159
#

CHANGELOG.md

Lines changed: 528 additions & 237 deletions
Large diffs are not rendered by default.

Carthage/Checkouts/BigInt/.codecov.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

Carthage/Checkouts/BigInt/.github/workflows/jazzy.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

Carthage/Checkouts/BigInt/.github/workflows/swift.yml

Lines changed: 0 additions & 47 deletions
This file was deleted.

Carthage/Checkouts/BigInt/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

Carthage/Checkouts/BigInt/.jazzy.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

Carthage/Checkouts/BigInt/.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/BigInt/.travis.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)