Skip to content

Commit

Permalink
Merge pull request #580 from dashpay/develop
Browse files Browse the repository at this point in the history
Release: v2.5.4
  • Loading branch information
pankcuf authored Nov 8, 2024
2 parents c0bcaf0 + 1828f75 commit 9dba479
Show file tree
Hide file tree
Showing 40 changed files with 1,531 additions and 183 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
name: Continuous Integration

on:
push:
branches:
Expand All @@ -10,7 +9,6 @@ on:
branches:
- master
- develop

jobs:
build:
name: Build
Expand All @@ -20,7 +18,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand Down Expand Up @@ -48,13 +46,17 @@ jobs:
xcode-version: '15.4'
- name: Rustup add targets
run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
- name: Dependencies
- name: Build dependencies
working-directory: ./dashsync/Example
run: pod install --repo-update --verbose
- name: Build
- name: Build for iOS Simulator (without code signing)
working-directory: ./dashsync/Example
env:
scheme: ${{ 'default' }}
scheme: ${{ 'DashSync-Example' }}
platform: ${{ 'iOS Simulator' }}
run: |
xcodebuild build -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13"
xcodebuild build \
-scheme "DashSync-Example" \
-workspace "DashSync.xcworkspace" \
-destination "platform=$platform,name=iPhone 13" \
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand Down
20 changes: 14 additions & 6 deletions .github/workflows/e2eTestsTestnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand Down Expand Up @@ -48,17 +48,25 @@ jobs:
- name: Dependencies
working-directory: ./dashsync/Example
run: pod install --repo-update
- name: Build
- name: Build for testing (with ad-hoc code signing)
working-directory: ./dashsync/Example
env:
scheme: ${{ 'default' }}
scheme: ${{ 'DashSync-Example' }}
platform: ${{ 'iOS Simulator' }}
run: |
xcodebuild build-for-testing -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13"
xcodebuild build-for-testing \
-scheme "DashSync-Example" \
-workspace "DashSync.xcworkspace" \
-destination "platform=$platform,name=iPhone 13" \
CODE_SIGN_IDENTITY="-" CODE_SIGNING_REQUIRED=YES CODE_SIGNING_ALLOWED=YES
- name: Test Syncing Chain
working-directory: ./dashsync/Example
env:
scheme: ${{ 'default' }}
scheme: ${{ 'DashSync-Example' }}
platform: ${{ 'iOS Simulator' }}
run: |
xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan TestnetE2ETests
xcodebuild test-without-building \
-scheme "DashSync-Example" \
-workspace "DashSync.xcworkspace" \
-destination "platform=$platform,name=iPhone 13" \
-testPlan TestnetE2ETests
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand All @@ -44,7 +44,7 @@ jobs:
run: cargo install cargo-lipo
- name: Rustup add targets
run: rustup target add x86_64-apple-darwin
- name: Dependencies
- name: Build Dependencies
working-directory: ./dashsync/Example
run: pod install --repo-update
- name: Cache network info build
Expand All @@ -71,7 +71,9 @@ jobs:
run: |
./NetworkInfo -outputDir ~/
- name: Archive network ping results
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4 # Updated to v4
with:
name: testnet-network-report
path: ~/networkHealth.json
retention-days: 30
compression-level: 6 # Default, adjust as needed
2 changes: 1 addition & 1 deletion .github/workflows/syncTestMainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
run: |
brew install automake
- name: Checkout DashSync
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: dashsync
submodules: recursive
Expand Down
21 changes: 15 additions & 6 deletions .github/workflows/syncTestTestnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
git lfs ls-files -l | cut -d' ' -f1 | sort > .lfs-assets-id
working-directory: ./dashsync
- name: Restore LFS cache
uses: actions/cache@v2
uses: actions/cache@v3
id: lfs-cache
with:
path: dashsync/.git/lfs
Expand All @@ -48,17 +48,26 @@ jobs:
- name: Dependencies
working-directory: ./dashsync/Example
run: pod install --repo-update
- name: Build
- name: Build for testing (without code signing)
working-directory: ./dashsync/Example
env:
scheme: ${{ 'default' }}
scheme: ${{ 'DashSync-Example' }}
platform: ${{ 'iOS Simulator' }}
run: |
xcodebuild build-for-testing -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13"
xcodebuild build-for-testing \
-scheme "DashSync-Example" \
-workspace "DashSync.xcworkspace" \
-destination "platform=$platform,name=iPhone 13" \
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO
- name: Test Syncing Chain
working-directory: ./dashsync/Example
env:
scheme: ${{ 'default' }}
scheme: ${{ 'DashSync-Example' }}
platform: ${{ 'iOS Simulator' }}
run: |
xcodebuild test-without-building -scheme "DashSync-Example" -workspace "DashSync.xcworkspace" -destination "platform=$platform,name=iPhone 13" -testPlan TestnetSyncTests
xcodebuild test-without-building \
-scheme "DashSync-Example" \
-workspace "DashSync.xcworkspace" \
-destination "platform=$platform,name=iPhone 13" \
-testPlan TestnetSyncTests \
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" CODE_SIGNING_ALLOWED=NO
Loading

0 comments on commit 9dba479

Please sign in to comment.