Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change macos runner to 13. #482

Draft
wants to merge 46 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
3916163
change macos runner to 13.
brnnmrls Oct 4, 2024
a5f5146
update macos runner for builds.
brnnmrls Oct 4, 2024
4fa046c
add debug comments
brnnmrls Oct 4, 2024
f023aa3
revert
brnnmrls Oct 4, 2024
afeb283
increase timeout time
brnnmrls Oct 4, 2024
a8bcbf5
adjust timeout
brnnmrls Oct 4, 2024
8eba6e4
Empty commit for testing
brnnmrls Oct 14, 2024
241058b
Empty commit for testing again
brnnmrls Nov 6, 2024
01054ae
Update simulator to 17.5.
brnnmrls Nov 7, 2024
9a47e8c
Change macos runner.
brnnmrls Nov 7, 2024
2e98954
Change macos runner to 13.
brnnmrls Nov 7, 2024
9384626
Revert macos runner to latest.
brnnmrls Nov 7, 2024
b45aefa
Update macos runner and revert simulator.
brnnmrls Nov 7, 2024
de3d596
Update to macos 14 runner.
brnnmrls Nov 7, 2024
08325c6
Update simulator to 18.0.
brnnmrls Nov 7, 2024
b587237
Change to macos-14.
brnnmrls Nov 8, 2024
294be90
Update simulator.
brnnmrls Nov 8, 2024
9611af3
Change timeout to 30s.
brnnmrls Nov 8, 2024
b7f7c95
Up timeout to 30s again.
brnnmrls Nov 8, 2024
5ef0911
Match the simulator.
brnnmrls Nov 8, 2024
2daff2d
Revert to original simulator.
brnnmrls Nov 8, 2024
4d5534e
Add artifacts to view failing test.
brnnmrls Nov 13, 2024
8656f53
Revert back to macos-latest runner.
brnnmrls Nov 13, 2024
d4e948b
Update iPhone simulator.
brnnmrls Nov 13, 2024
4680261
Modify result bundle path.
brnnmrls Nov 14, 2024
5b9fa6c
Wait for xcresult file.
brnnmrls Nov 14, 2024
14522b7
List the files.
brnnmrls Nov 15, 2024
02dee9a
Continue to un steps even with error.
brnnmrls Nov 15, 2024
a3756fd
Add ./ to find path.
brnnmrls Nov 15, 2024
c68c670
Remove path.
brnnmrls Nov 15, 2024
efc9888
Insert path.
brnnmrls Nov 15, 2024
cb0c9af
New path.
brnnmrls Nov 15, 2024
99b896f
Change macos runner.
brnnmrls Nov 15, 2024
1b1b5a2
Make directory.
brnnmrls Nov 15, 2024
d042ee8
Update directory.
brnnmrls Nov 16, 2024
07bdc17
Update directory.
brnnmrls Nov 16, 2024
5c2be7d
Add resultbundlepath.
brnnmrls Nov 16, 2024
e3b3fa2
Change directory name.
brnnmrls Nov 16, 2024
f051ce4
Upload xcresult file.
brnnmrls Nov 16, 2024
c666be7
Correct the path.
brnnmrls Nov 16, 2024
a6e30dc
View TestArtifacts files.
brnnmrls Nov 16, 2024
5f0e425
Update paths.
brnnmrls Nov 16, 2024
4cc2790
Change path.
brnnmrls Nov 16, 2024
215b807
Change output.
brnnmrls Nov 18, 2024
651b1e0
Create new path.
brnnmrls Nov 18, 2024
41edfbe
Rerun tests.
brnnmrls Nov 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
fi

swift-button-functional-test:
runs-on: macos-latest
runs-on: macos-14
needs: check-pr-body-for-key
# Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner.
if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }}
Expand All @@ -66,6 +66,7 @@ jobs:
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4'
- name: Run test target for Google Sign-in button for Swift
continue-on-error: true
env:
EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }}
PASSWORD_SECRET : ${{ secrets.PASSWORD_SECRET }}
Expand All @@ -77,7 +78,26 @@ jobs:
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \
EMAIL_SECRET=$EMAIL_SECRET \
PASSWORD_SECRET=$PASSWORD_SECRET
PASSWORD_SECRET=$PASSWORD_SECRET \
-resultBundlePath Artifacts2.xcresult
- name: Wait for xcresult file
run: sleep 30
- name: List files
run: ls -R
- name: Current path
run: pwd
- name: Make fake file.
run: echo hello > Artifacts2.xcresult/world.txt
- name: Wait to upload xcresult file
run: sleep 30
- name: Upload xcresult file
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: DaysUntilBirthday-${{ github.run_number }}.xcresult
path: Samples/Swift/DaysUntilBirthday/Artifacts2.xcresult
- name: List files again
run: ls -R

app-check-api-token-tests:
runs-on: macOS-13
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- sdk: 'macosx'
destination: '"platform=OS X,arch=x86_64"'
- sdk: 'iphonesimulator'
destination: '"platform=iOS Simulator,name=iPhone 14"'
destination: '"platform=iOS Simulator,name=iPhone 15"'
steps:
- uses: actions/checkout@v3
- name: Build unit test target
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ extension DaysUntilBirthdayUITests_iOS {
return false
}
guard sampleApp.staticTexts["User Profile"]
.waitForExistence(timeout: timeout) else {
.waitForExistence(timeout: 30) else {
XCTFail("Failed to sign in and return to app's User Profile view.")
return false
}
Expand All @@ -124,11 +124,13 @@ extension DaysUntilBirthdayUITests_iOS {
/// This will assumme the full flow where a user must type in an email and
/// password to sign in with.
func signInForTheFirstTime() -> Bool {
print("BOO: it's the first time")
guard sampleApp.textFields["Email or phone"]
.waitForExistence(timeout: timeout) else {
.waitForExistence(timeout: 30) else {
XCTFail("Failed to find email textfield")
return false
}
print("BOO: before the return button")
guard sampleApp
.keyboards
.element
Expand All @@ -137,15 +139,17 @@ extension DaysUntilBirthdayUITests_iOS {
XCTFail("Failed to find 'return' button")
return false
}

print("BOO: before typing in email or phone text")
sampleApp.textFields["Email or phone"].typeText(Credential.email.rawValue)
print("BOO: before tapping on return for email or phone")
sampleApp.keyboards.element.buttons["return"].tap()

print("BOO: before entering password")
guard sampleApp.secureTextFields["Enter your password"]
.waitForExistence(timeout: timeout) else {
XCTFail("Failed to find password textfield")
return false
}
print("BOO: before checking existence of return for password")
guard sampleApp
.keyboards
.element
Expand All @@ -154,12 +158,12 @@ extension DaysUntilBirthdayUITests_iOS {
XCTFail("Failed to find 'return' button")
return false
}

print("BOO: before entering return on password")
sampleApp
.secureTextFields["Enter your password"]
.typeText(Credential.password.rawValue)
sampleApp.keyboards.element.buttons["return"].tap()

print("BOO: before password manager prompt existence")
if sampleApp
.staticTexts[passwordManagerPrompt]
.waitForExistence(timeout: timeout) {
Expand All @@ -169,7 +173,9 @@ extension DaysUntilBirthdayUITests_iOS {
XCTFail("Failed to find \(notNowText) button")
return false
}
print("BOO: before not now text tap")
sampleApp.buttons[notNowText].tap()
print("BOO: after not now text tap")
}

// Proceed through sign-in disclaimer and/or access request view(s) if needed
Expand Down
Loading