Skip to content

Commit

Permalink
Tweaks for flaky tests (#13971)
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 authored Oct 25, 2024
1 parent 36da449 commit 0f73266
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
run: scripts/setup_bundler.sh
- name: Install xcpretty
run: gem install xcpretty
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
- name: IntegrationTest
# Only iOS to mitigate flakes.
run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/remoteconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,35 @@ jobs:
- os: macos-13
xcode: Xcode_15.2
target: iOS
test: spm
- os: macos-14
xcode: Xcode_15.4
target: iOS
test: spm
- os: macos-15
xcode: Xcode_16
target: iOS
test: spm
- os: macos-15
xcode: Xcode_16
target: tvOS
test: spm
- os: macos-15
xcode: Xcode_16
target: macOS
test: spm
- os: macos-15
xcode: Xcode_16
target: watchOS
test: spmbuildonly
- os: macos-15
xcode: Xcode_16
target: catalyst
test: spm
- os: macos-15
xcode: Xcode_16
target: visionOS
test: spm
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand All @@ -153,7 +161,7 @@ jobs:
- name: Unit Tests
run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigUnit ${{ matrix.target }} spm
- name: Fake Console tests
run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} spm
run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigFakeConsole ${{ matrix.target }} ${{ matrix.test }}

catalyst:
# Don't run on private repo unless it is a PR.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
matrix:
language: [Swift, ObjC]
include:
- os: macos-14
xcode: Xcode_15.4
- os: macos-15
xcode: Xcode_16
env:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
runs-on: ${{ matrix.os }}
Expand Down

0 comments on commit 0f73266

Please sign in to comment.