Skip to content

[Infra] Exclude pods that aren't releasing in GHAMatrixSpecCollector #14119

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Nov 14, 2024
Merged

[Infra] Exclude pods that aren't releasing in GHAMatrixSpecCollector #14119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c70711
[Infra] Exclude pods that aren't releasing in GHAMatrixSpecCollector
andrewheard Nov 14, 2024
62ef132
Allow running release.buildup_SpecsReleasing_repo with workflow_dispatch
andrewheard Nov 14, 2024
431fa6b
Allow running cocoapods-integration.tests with workflow_dispatch
andrewheard Nov 14, 2024
e936660
Allow running generate_notices.generate_a_notice with workflow_dispatch
andrewheard Nov 14, 2024
252310e
Split long line
andrewheard Nov 14, 2024
0d34710
Filter out pods that aren't releasing in `parsePodNames`
andrewheard Nov 14, 2024
7e81a97
Merge remote-tracking branch 'origin/main' into ah/exclude-combine
andrewheard Nov 14, 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
1 change: 1 addition & 0 deletions .github/workflows/cocoapods-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
tests:
# Don't run on private repo unless it is a PR.
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
|| github.event_name == 'workflow_dispatch'

runs-on: macos-14
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notice_generation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
generate_a_notice:
# Don't run on private repo.
if: github.repository == 'Firebase/firebase-ios-sdk'
if: github.repository == 'Firebase/firebase-ios-sdk' || github.event_name == 'workflow_dispatch'
runs-on: macos-14
name: Generate NOTICES
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ jobs:
buildup_SpecsReleasing_repo:
needs: [buildup_SpecsReleasing_repo_FirebaseCore, specs_checking]
# Don't run on private repo unless it is a PR.
if: github.repository == 'Firebase/firebase-ios-sdk'
if: github.repository == 'Firebase/firebase-ios-sdk' || github.event_name == 'workflow_dispatch'
runs-on: macos-14
strategy:
fail-fast: false
Expand Down
3 changes: 1 addition & 2 deletions ReleaseTooling/Sources/ManifestParser/GHAMatrixSpecCollector.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ struct SDKPodspec: Codable {
struct GHAMatrixSpecCollector {
var SDKRepoURL: URL
var outputSpecFileURL: URL
var excludedSDKs: [String] = []

func getPodsInManifest(_ manifest: Manifest) -> [String: SDKPodspec] {
var podsMap: [String: SDKPodspec] = [:]
for pod in manifest.pods {
for pod in manifest.pods.filter({ $0.releasing }) {
podsMap[pod.name] = SDKPodspec(podspec: pod.name, allowWarnings: pod.allowWarnings)
}
return podsMap
Expand Down
9 changes: 2 additions & 7 deletions ReleaseTooling/Sources/ManifestParser/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,12 @@ struct ManifestParser: ParsableCommand {
})
var outputFilePath: URL

@Option(parsing: .upToNextOption, help: "Podspec files that will not be included.")
var excludedSpecs: [String]

@Flag(help: "Parsing mode for manifest")
var mode: ParsingMode

func parsePodNames(_ manifest: Manifest) throws {
var output: [String] = []
for pod in manifest.pods {
for pod in manifest.pods.filter({ $0.releasing }) {
output.append(pod.name)
}
do {
Expand All @@ -69,9 +66,7 @@ struct ManifestParser: ParsableCommand {
try parsePodNames(FirebaseManifest.shared)
case .forGHAMatrixGeneration:
guard let sdkRepoURL = SDKRepoURL else {
throw fatalError(
"--sdk-repo-url should be specified when --for-gha-matrix-generation is on."
)
fatalError("--sdk-repo-url should be specified when --for-gha-matrix-generation is on.")
}
let specCollector = GHAMatrixSpecCollector(
SDKRepoURL: sdkRepoURL,
Expand Down
Loading