Skip to content

Commit bc8fe4b

Browse files
Merge branch 'develop' into master
2 parents da1517d + e733e07 commit bc8fe4b

File tree

296 files changed

+8868
-18457
lines changed

Some content is hidden

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

296 files changed

+8868
-18457
lines changed

.github/workflows/ci.yml

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

.github/workflows/macOS-11.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: "macOS 11"
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- master
7+
8+
env:
9+
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
10+
11+
jobs:
12+
spm:
13+
name: Swift Package Manager 5.5
14+
runs-on: macOS-11
15+
concurrency:
16+
group: spm-${{ github.run_id }}
17+
cancel-in-progress: false
18+
steps:
19+
- uses: actions/checkout@v2
20+
- name: Resolve dependencies
21+
run: swift package resolve
22+
- name: Build
23+
run: swift build --build-tests
24+
- name: Install ganache
25+
run: npm install ganache --global
26+
- name: Start ganache in background
27+
run: ganache &
28+
- name: Wait till ganache starts
29+
run: sleep 1
30+
- name: Run local tests
31+
run: swift test --skip-build -c debug --filter localTests
32+
- name: Run remote tests
33+
run: swift test --skip-build -c debug --filter remoteTests

.github/workflows/macOS-12.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: "macOS 12"
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
- hotfix
9+
- unstable
10+
paths:
11+
- Packag*.swift
12+
- web3swift.podspec
13+
- Cartfile
14+
- Sources/**
15+
- 'Tests/**'
16+
- 'web3swift*/**'
17+
- '.github/workflows/**'
18+
pull_request:
19+
branches:
20+
- master
21+
- develop
22+
- unstable
23+
24+
env:
25+
DEVELOPER_DIR: /Applications/Xcode_13.3.1.app/Contents/Developer
26+
27+
jobs:
28+
spm:
29+
name: Swift Package Manager 5.5
30+
runs-on: macOS-12
31+
concurrency:
32+
group: spm-${{ github.run_id }}
33+
cancel-in-progress: false
34+
steps:
35+
- uses: actions/checkout@v2
36+
- name: Resolve dependencies
37+
run: swift package resolve
38+
- name: Build
39+
run: swift build --build-tests
40+
- name: Install ganache
41+
run: npm install ganache --global
42+
- name: Start ganache in background
43+
run: ganache &
44+
- name: Wait till ganache starts
45+
run: sleep 1
46+
- name: Run local tests
47+
run: swift test --skip-build -c debug --filter localTests
48+
- name: Run remote tests
49+
run: swift test --skip-build -c debug --filter remoteTests

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ xcuserdata/
2121
*.moved-aside
2222
*.xccheckout
2323
*.xcscmblueprint
24+
web3swift.xcodeproj/
2425

2526
## Obj-C/Swift specific
2627
*.hmap
@@ -40,6 +41,7 @@ Package.pins
4041
.build/
4142
.swiftpm/**
4243
*/.swiftpm/**
44+
Package.resolved
4345

4446
# CocoaPods
4547
#

Cartfile

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

Cartfile.resolved

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

Documentation/README.md

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

Documentation/RELEASE_GUIDE.md

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

0 commit comments

Comments
 (0)