diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index efc5fa55..e940b3cd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,8 +9,11 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 - + - name: Install dependencies + run: sh scripts/install.sh + - name: Run tests + run: sh scripts/test.sh - name: Deploy to Cocoapods run: sh scripts/deploy.sh env: - COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} \ No newline at end of file + COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c85f906c..64b7537e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,7 @@ name: Run tests on: - push: + pull_request: branches: - develop - master @@ -11,5 +11,7 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v2 + - name: Install dependencies + run: sh scripts/install.sh - name: Run tests - run: sh scripts/test.sh \ No newline at end of file + run: sh scripts/test.sh diff --git a/Podfile.lock b/Podfile.lock index ab089fd7..29ccec7e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - Backtrace (1.5.6): + - Backtrace (1.6.0): - Backtrace-PLCrashReporter - Backtrace-PLCrashReporter (1.5.4) - Nimble (9.0.0) @@ -22,7 +22,7 @@ EXTERNAL SOURCES: :path: "./Backtrace.podspec" SPEC CHECKSUMS: - Backtrace: 90f5a8b6bc9d417a444ce62435bbda0c54fa8d89 + Backtrace: 90e82b3be4a6bde054dcb4663511a37113c348a8 Backtrace-PLCrashReporter: 65b9aae5468bb6af6b55b88de22b49e031331054 Nimble: 3b4ec3fd40f1dc178058e0981107721c615643d8 Quick: 60f0ea3b8e0cfc0df3259a5c06a238ad8b3c46e0 diff --git a/scripts/install.sh b/scripts/install.sh index 268930f7..80a85199 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,4 +4,7 @@ set -o pipefail # to exit when the status of the last command that threw a non-z set -o nounset # to exit when your script tries to use undeclared variables set -o xtrace # to trace what gets executed. Useful for debugging -brew bundle \ No newline at end of file +# ignore installation errors silently +brew bundle || true + +pod install \ No newline at end of file