Skip to content

Commit 763fd89

Browse files
morganchen12morganchen12
committed
Merge branch 'swift-6' into mc/messaging
2 parents b66ede5 + 6487a3e commit 763fd89

24 files changed

+4028
-4005
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 207 additions & 206 deletions
Large diffs are not rendered by default.

‎.github/workflows/appdistribution.yml‎

Lines changed: 112 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,121 +1,122 @@
1-
name: appdistribution
1+
# TODO(Swift 6): Re-enable these tests.
2+
# name: appdistribution
23

3-
on:
4-
pull_request:
5-
paths:
6-
- 'FirebaseAppDistribution**'
7-
- '.github/workflows/appdistribution.yml'
8-
- 'Gemfile*'
9-
schedule:
10-
# Run every day at 1am (PST) - cron uses UTC times
11-
- cron: '0 9 * * *'
4+
# on:
5+
# pull_request:
6+
# paths:
7+
# - 'FirebaseAppDistribution**'
8+
# - '.github/workflows/appdistribution.yml'
9+
# - 'Gemfile*'
10+
# schedule:
11+
# # Run every day at 1am (PST) - cron uses UTC times
12+
# - cron: '0 9 * * *'
1213

13-
concurrency:
14-
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
15-
cancel-in-progress: true
14+
# concurrency:
15+
# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
16+
# cancel-in-progress: true
1617

17-
jobs:
18-
pod-lib-lint:
19-
# Don't run on private repo unless it is a PR.
20-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
18+
# jobs:
19+
# pod-lib-lint:
20+
# # Don't run on private repo unless it is a PR.
21+
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
2122

22-
strategy:
23-
matrix:
24-
include:
25-
- os: macos-15
26-
xcode: Xcode_16.2
27-
runs-on: ${{ matrix.os }}
28-
steps:
29-
- uses: actions/checkout@v4
30-
- uses: ruby/setup-ruby@v1
31-
- name: Setup Bundler
32-
run: scripts/setup_bundler.sh
33-
- name: Xcode
34-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
35-
- name: Build and test
36-
run: |
37-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
38-
--platforms=ios
23+
# strategy:
24+
# matrix:
25+
# include:
26+
# - os: macos-15
27+
# xcode: Xcode_16.2
28+
# runs-on: ${{ matrix.os }}
29+
# steps:
30+
# - uses: actions/checkout@v4
31+
# - uses: ruby/setup-ruby@v1
32+
# - name: Setup Bundler
33+
# run: scripts/setup_bundler.sh
34+
# - name: Xcode
35+
# run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
36+
# - name: Build and test
37+
# run: |
38+
# scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
39+
# --platforms=ios
3940

40-
spm-package-resolved:
41-
env:
42-
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
43-
runs-on: macos-15
44-
outputs:
45-
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
46-
steps:
47-
- uses: actions/checkout@v4
48-
- name: Generate Swift Package.resolved
49-
id: swift_package_resolve
50-
run: |
51-
swift package resolve
52-
- name: Generate cache key
53-
id: generate_cache_key
54-
run: |
55-
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
56-
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
57-
- uses: actions/cache/save@v4
58-
id: cache
59-
with:
60-
path: .build
61-
key: ${{ steps.generate_cache_key.outputs.cache_key }}
41+
# spm-package-resolved:
42+
# env:
43+
# FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
44+
# runs-on: macos-15
45+
# outputs:
46+
# cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
47+
# steps:
48+
# - uses: actions/checkout@v4
49+
# - name: Generate Swift Package.resolved
50+
# id: swift_package_resolve
51+
# run: |
52+
# swift package resolve
53+
# - name: Generate cache key
54+
# id: generate_cache_key
55+
# run: |
56+
# cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
57+
# echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
58+
# - uses: actions/cache/save@v4
59+
# id: cache
60+
# with:
61+
# path: .build
62+
# key: ${{ steps.generate_cache_key.outputs.cache_key }}
6263

63-
spm:
64-
# Don't run on private repo unless it is a PR.
65-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
66-
needs: [spm-package-resolved]
67-
strategy:
68-
matrix:
69-
include:
70-
- os: macos-15
71-
xcode: Xcode_16.2
72-
runs-on: ${{ matrix.os }}
73-
steps:
74-
- uses: actions/checkout@v4
75-
- uses: actions/cache/restore@v4
76-
with:
77-
path: .build
78-
key: ${{needs.spm-package-resolved.outputs.cache_key}}
79-
- name: Xcode
80-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
81-
- name: Initialize xcodebuild
82-
run: scripts/setup_spm_tests.sh
83-
- name: iOS Unit Tests
84-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppDistributionUnit iOS spm
64+
# spm:
65+
# # Don't run on private repo unless it is a PR.
66+
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
67+
# needs: [spm-package-resolved]
68+
# strategy:
69+
# matrix:
70+
# include:
71+
# - os: macos-15
72+
# xcode: Xcode_16.2
73+
# runs-on: ${{ matrix.os }}
74+
# steps:
75+
# - uses: actions/checkout@v4
76+
# - uses: actions/cache/restore@v4
77+
# with:
78+
# path: .build
79+
# key: ${{needs.spm-package-resolved.outputs.cache_key}}
80+
# - name: Xcode
81+
# run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
82+
# - name: Initialize xcodebuild
83+
# run: scripts/setup_spm_tests.sh
84+
# - name: iOS Unit Tests
85+
# run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppDistributionUnit iOS spm
8586

86-
catalyst:
87-
# Don't run on private repo unless it is a PR.
88-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
87+
# catalyst:
88+
# # Don't run on private repo unless it is a PR.
89+
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
8990

90-
runs-on: macos-15
91-
steps:
92-
- uses: actions/checkout@v4
93-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
94-
with:
95-
cache_key: catalyst${{ matrix.os }}
96-
- uses: ruby/setup-ruby@v1
97-
- name: Setup Bundler
98-
run: scripts/setup_bundler.sh
99-
- name: Setup project and Build for Catalyst
100-
run: scripts/test_catalyst.sh FirebaseAppDistribution test FirebaseAppDistribution-Unit-unit
91+
# runs-on: macos-15
92+
# steps:
93+
# - uses: actions/checkout@v4
94+
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
95+
# with:
96+
# cache_key: catalyst${{ matrix.os }}
97+
# - uses: ruby/setup-ruby@v1
98+
# - name: Setup Bundler
99+
# run: scripts/setup_bundler.sh
100+
# - name: Setup project and Build for Catalyst
101+
# run: scripts/test_catalyst.sh FirebaseAppDistribution test FirebaseAppDistribution-Unit-unit
101102

102-
appdistribution-cron-only:
103-
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
103+
# appdistribution-cron-only:
104+
# if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
104105

105-
runs-on: macos-15
106-
strategy:
107-
matrix:
108-
target: [ios]
109-
flags: [
110-
'--use-static-frameworks'
111-
]
112-
needs: pod-lib-lint
113-
steps:
114-
- uses: actions/checkout@v4
115-
- uses: ruby/setup-ruby@v1
116-
- name: Setup Bundler
117-
run: scripts/setup_bundler.sh
118-
- name: PodLibLint App Distribution Cron
119-
run: |
120-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
121-
--platforms=${{ matrix.target }} ${{ matrix.flags }}
106+
# runs-on: macos-15
107+
# strategy:
108+
# matrix:
109+
# target: [ios]
110+
# flags: [
111+
# '--use-static-frameworks'
112+
# ]
113+
# needs: pod-lib-lint
114+
# steps:
115+
# - uses: actions/checkout@v4
116+
# - uses: ruby/setup-ruby@v1
117+
# - name: Setup Bundler
118+
# run: scripts/setup_bundler.sh
119+
# - name: PodLibLint App Distribution Cron
120+
# run: |
121+
# scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
122+
# --platforms=${{ matrix.target }} ${{ matrix.flags }}

0 commit comments

Comments
 (0)