Skip to content

Commit bd642fd

Browse files
peteapetea
authored
Merge branch 'main' into mdmathias/async-support
2 parents db1677e + 6ab0211 commit bd642fd

35 files changed

+594
-322
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: Bug Report
3+
about: Submit a bug report if something isn't working as expected.
4+
title: ""
5+
labels: bug, triage
6+
assignees: ""
7+
---
8+
9+
**Describe the bug**
10+
A clear and concise description of what the bug is.
11+
12+
**To Reproduce**
13+
Steps to reproduce the behavior:
14+
1. Go to '...'
15+
2. Tap on '....'
16+
3. Scroll down to '....'
17+
4. See error
18+
19+
**Expected behavior**
20+
A clear and concise description of what you expected to happen.
21+
22+
**Screenshots**
23+
If applicable, add screenshots to help explain your problem.
24+
25+
**Environment**
26+
- Device: [ e.g. iPhone 13, MacBook Pro, etc ]
27+
- OS: [ e.g. iOS 15, macOS 11, etc ]
28+
- Browser: [ e.g. Safari, Chrome, etc ]
29+
30+
**Additional context**
31+
Add any other context about the problem here.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Feature Request
3+
about: Make a feature request if you have a suggestion for something new.
4+
title: ""
5+
labels: enhancement, triage
6+
assignees: ""
7+
---
8+
9+
**Is your feature request related to a problem you're having? Please describe.**
10+
A clear and concise description of what the problem is.
11+
12+
**Describe the solution you'd like**
13+
A clear and concise description of what you want to happen.
14+
15+
**Describe alternatives you've considered**
16+
A clear and concise description of any alternative solutions or features you've considered.
17+
18+
**Additional context**
19+
Add any other context or screenshots about the feature request here.

‎.github/workflows/builds.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
os: [macos-11, macos-12]
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- name: Archive for iOS
1818
run: |
1919
xcodebuild \

‎.github/workflows/integration_tests.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: integration_tests
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
12+
swift-button-functional-test:
13+
runs-on: macOS-12
14+
# Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner.
15+
if: "!github.event.pull_request.head.repo.fork"
16+
defaults:
17+
run:
18+
working-directory: Samples/Swift/DaysUntilBirthday
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v3
22+
- name: Build test target for Google Sign-in button for Swift
23+
run: |
24+
xcodebuild \
25+
-project DaysUntilBirthday.xcodeproj \
26+
build-for-testing \
27+
-scheme DaysUntilBirthday\ \(iOS\) \
28+
-sdk iphonesimulator \
29+
-destination 'platform=iOS Simulator,name=iPhone 11'
30+
- name: Run test target for Google Sign-in button for Swift
31+
env:
32+
EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }}
33+
PASSWORD_SECRET : ${{ secrets.PASSWORD_SECRET }}
34+
run: |
35+
xcodebuild \
36+
-project DaysUntilBirthday.xcodeproj \
37+
test-without-building \
38+
-scheme DaysUntilBirthday\ \(iOS\) \
39+
-sdk iphonesimulator \
40+
-destination 'platform=iOS Simulator,name=iPhone 11' \
41+
EMAIL_SECRET=$EMAIL_SECRET \
42+
PASSWORD_SECRET=$PASSWORD_SECRET

‎.github/workflows/pr_notification.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ jobs:
1010
steps:
1111
- name: Pull Request Details
1212
run: |
13-
echo "Pull Request: ${{ github.event.pull_request.title }}"
13+
echo "Pull Request: ${{ github.event.pull_request.number }}"
1414
echo "Author: ${{ github.event.pull_request.user.login }}"
1515
1616
- name: Google Chat Notification
17+
shell: bash
18+
env:
19+
TITLE: ${{ github.event.pull_request.title }}
20+
LABELS: ${{ join(github.event.pull_request.labels.*.name, ', ') }}
1721
run: |
1822
curl --location --request POST '${{ secrets.WEBHOOK_URL }}' \
1923
--header 'Content-Type: application/json' \
@@ -36,7 +40,7 @@ jobs:
3640
{
3741
"keyValue": {
3842
"topLabel": "Title",
39-
"content": "${{ github.event.pull_request.title }}"
43+
"content": "'"$TITLE"'"
4044
}
4145
},
4246
{
@@ -66,7 +70,7 @@ jobs:
6670
{
6771
"keyValue": {
6872
"topLabel": "Labels",
69-
"content": "- ${{ join(github.event.pull_request.labels.*.name, ', ') }}"
73+
"content": "- '"$LABELS"'"
7074
}
7175
},
7276
{

‎.github/workflows/push_notification.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
jobs:
99
notify-push-main:
1010
runs-on: ubuntu-latest
11+
env:
12+
COMMIT: ${{ github.event.head_commit.message }}
1113
steps:
1214
- name: Main Branch Push
1315
run: |
@@ -24,7 +26,7 @@ jobs:
2426
{
2527
"header": {
2628
"title": "Push to main branch",
27-
"subtitle": "${{ github.event.head_commit.message }}"
29+
"subtitle": "'"$COMMIT"'"
2830
},
2931
"sections": [
3032
{

‎.github/workflows/scorecards.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Scorecards supply-chain security
2+
on:
3+
# Only the default branch is supported.
4+
branch_protection_rule:
5+
schedule:
6+
- cron: '36 4 * * 3'
7+
push:
8+
branches: [ "main" ]
9+
10+
# Declare default permissions as read only.
11+
permissions: read-all
12+
13+
jobs:
14+
analysis:
15+
name: Scorecards analysis
16+
runs-on: ubuntu-latest
17+
permissions:
18+
# Needed to upload the results to code-scanning dashboard.
19+
security-events: write
20+
# Used to receive a badge. (Upcoming feature)
21+
id-token: write
22+
# Needs for private repositories.
23+
contents: read
24+
actions: read
25+
26+
steps:
27+
- name: "Checkout code"
28+
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
29+
with:
30+
persist-credentials: false
31+
32+
- name: "Run analysis"
33+
uses: ossf/scorecard-action@3e15ea8318eee9b333819ec77a36aca8d39df13e # tag=v1.1.1
34+
with:
35+
results_file: results.sarif
36+
results_format: sarif
37+
# (Optional) Read-only PAT token. Uncomment the `repo_token` line below if:
38+
# - you want to enable the Branch-Protection check on a *public* repository, or
39+
# - you are installing Scorecards on a *private* repository
40+
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
41+
# repo_token: ${{ secrets.SCORECARD_READ_TOKEN }}
42+
43+
# Publish the results for public repositories to enable scorecard badges. For more details, see
44+
# https://github.com/ossf/scorecard-action#publishing-results.
45+
# For private repositories, `publish_results` will automatically be set to `false`, regardless
46+
# of the value entered here.
47+
publish_results: true
48+
49+
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
50+
# format to the repository Actions tab.
51+
- name: "Upload artifact"
52+
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # tag=v3.0.0
53+
with:
54+
name: SARIF file
55+
path: results.sarif
56+
retention-days: 5
57+
58+
# Upload the results to GitHub's code scanning dashboard.
59+
- name: "Upload to code-scanning"
60+
uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # tag=v1.0.26
61+
with:
62+
sarif_file: results.sarif

‎.github/workflows/tests.yml‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ on:
55
branches:
66
- main
77
pull_request:
8-
branches:
9-
- main
108
workflow_dispatch:
119

1210
jobs:
@@ -27,7 +25,7 @@ jobs:
2725
- podspec: GoogleSignInSwiftSupport.podspec
2826
includePodspecFlag: "--include-podspecs='GoogleSignIn.podspec'"
2927
steps:
30-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
3129
- name: Update Bundler
3230
run: bundle update --bundler
3331
- name: Install Ruby gems with Bundler
@@ -50,7 +48,7 @@ jobs:
5048
- sdk: 'iphonesimulator'
5149
destination: '"platform=iOS Simulator,name=iPhone 11"'
5250
steps:
53-
- uses: actions/checkout@v2
51+
- uses: actions/checkout@v3
5452
- name: Build unit test target
5553
run: |
5654
xcodebuild \
@@ -66,33 +64,3 @@ jobs:
6664
-destination ${{ matrix.destination }} \
6765
test-without-building
6866
69-
swift-button-functional-test:
70-
if: ${{ false }} # Disable integration tests while we figure out OTAs
71-
runs-on: macOS-latest
72-
defaults:
73-
run:
74-
working-directory: Samples/Swift/DaysUntilBirthday
75-
steps:
76-
- name: Checkout
77-
uses: actions/checkout@v2
78-
- name: Build test target for Google Sign-in button for Swift
79-
run: |
80-
xcodebuild \
81-
-project DaysUntilBirthday.xcodeproj \
82-
build-for-testing \
83-
-scheme DaysUntilBirthday\ \(iOS\) \
84-
-sdk iphonesimulator \
85-
-destination 'platform=iOS Simulator,name=iPhone 11'
86-
- name: Run test target for Google Sign-in button for Swift
87-
env:
88-
EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }}
89-
PASSWORD_SECRET : ${{ secrets.PASSWORD_SECRET }}
90-
run: |
91-
xcodebuild \
92-
-project DaysUntilBirthday.xcodeproj \
93-
test-without-building \
94-
-scheme DaysUntilBirthday\ \(iOS\) \
95-
-sdk iphonesimulator \
96-
-destination 'platform=iOS Simulator,name=iPhone 11' \
97-
EMAIL_SECRET=$EMAIL_SECRET \
98-
PASSWORD_SECRET=$PASSWORD_SECRET

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# 6.2.4 (2022-9-13)
2+
- Updated the GTMSessionFetcher dependency to allow 2.x versions. ([#207](https://github.com/google/GoogleSignIn-iOS/pull/207))
3+
4+
# 6.2.3 (2022-8-18)
5+
- Fix resource loading in GoogleSignInSwift with CocoaPods use_frameworks! ([#197](https://github.com/google/GoogleSignIn-iOS/pull/197))
6+
- Prevent build errors for GoogleSignInSwift in certain scenarios when using Swift Package Manager. ([#166](https://github.com/google/GoogleSignIn-iOS/pull/166))
7+
18
# 6.2.2 (2022-5-27)
29
- Prevent build errors for GoogleSignInSwift when using Swift Package Manager. ([#157](https://github.com/google/GoogleSignIn-iOS/pull/157))
310
- Prevent a build error on Xcode 12 and earlier. ([#158](https://github.com/google/GoogleSignIn-iOS/pull/158))

0 commit comments

Comments
 (0)