Skip to content

Commit

Permalink
Revert CI changes made to narrow down problem
Browse files Browse the repository at this point in the history
  • Loading branch information
ncooke3 committed Sep 16, 2023
1 parent e536874 commit 682afd2
Show file tree
Hide file tree
Showing 8 changed files with 1,508 additions and 1,508 deletions.
180 changes: 90 additions & 90 deletions .github/workflows/api_diff_report.yml
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
# name: API Diff Report

# on: [pull_request]

# concurrency:
# group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
# cancel-in-progress: true

# env:
# STAGE_PROGRESS: progress
# STAGE_END: end
# PR_API_OUTPUT: ci_outputs/pr_branch_api
# BASE_API_OUTPUT: ci_outputs/base_branch_api
# DIFF_REPORT_OUTPUT: ci_outputs/diff_report

# jobs:
# diff_report:
# runs-on: macos-latest
# env:
# FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1

# steps:
# - name: Checkout PR branch
# uses: actions/checkout@v3
# with:
# fetch-depth: 2

# - name: Copy diff report tools
# run: cp -a scripts/api_diff_report/. ~/api_diff_report

# - id: get_changed_files
# name: Get changed file list
# run: |
# echo "file_list=$(git diff --name-only -r HEAD^1 HEAD | tr '\n' ' ')" >> $GITHUB_OUTPUT

# - name: Setup python
# uses: actions/setup-python@v4
# with:
# python-version: 3.7

# - name: Install Prerequisites
# run: ~/api_diff_report/prerequisite.sh

# - name: Clean Diff Report Comment in PR
# run: |
# python ~/api_diff_report/pr_commenter.py \
# --stage ${{ env.STAGE_PROGRESS }} \
# --token ${{github.token}} \
# --pr_number ${{github.event.pull_request.number}} \
# --commit $GITHUB_SHA \
# --run_id ${{github.run_id}}

# - name: Generate API files for PR branch
# run: |
# python ~/api_diff_report/api_info.py \
# --file_list ${{ steps.get_changed_files.outputs.file_list }} \
# --output_dir ${{ env.PR_API_OUTPUT }}

# - name: Checkout Base branch
# run: git checkout HEAD^

# - name: Generate API files for Base branch
# run: |
# python ~/api_diff_report/api_info.py \
# --file_list ${{ steps.get_changed_files.outputs.file_list }} \
# --output_dir ${{ env.BASE_API_OUTPUT }}

# - name: Generate API Diff Report
# run: |
# python ~/api_diff_report/api_diff_report.py \
# --pr_branch ${{ env.PR_API_OUTPUT }} \
# --base_branch ${{ env.BASE_API_OUTPUT }} \
# --output_dir ${{ env.DIFF_REPORT_OUTPUT }}

# - name: Update Diff Report Comment in PR
# run: |
# python ~/api_diff_report/pr_commenter.py \
# --stage ${{ env.STAGE_END }} \
# --report ${{ env.DIFF_REPORT_OUTPUT }} \
# --token ${{github.token}} \
# --pr_number ${{github.event.pull_request.number}} \
# --commit $GITHUB_SHA \
# --run_id ${{github.run_id}}

# - uses: actions/upload-artifact@v3
# if: ${{ !cancelled() }}
# with:
# name: api_info_and_report
# path: ci_outputs
# retention-days: 1
name: API Diff Report

on: [pull_request]

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

env:
STAGE_PROGRESS: progress
STAGE_END: end
PR_API_OUTPUT: ci_outputs/pr_branch_api
BASE_API_OUTPUT: ci_outputs/base_branch_api
DIFF_REPORT_OUTPUT: ci_outputs/diff_report

jobs:
diff_report:
runs-on: macos-latest
env:
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1

steps:
- name: Checkout PR branch
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Copy diff report tools
run: cp -a scripts/api_diff_report/. ~/api_diff_report

- id: get_changed_files
name: Get changed file list
run: |
echo "file_list=$(git diff --name-only -r HEAD^1 HEAD | tr '\n' ' ')" >> $GITHUB_OUTPUT
- name: Setup python
uses: actions/setup-python@v4
with:
python-version: 3.7

- name: Install Prerequisites
run: ~/api_diff_report/prerequisite.sh

- name: Clean Diff Report Comment in PR
run: |
python ~/api_diff_report/pr_commenter.py \
--stage ${{ env.STAGE_PROGRESS }} \
--token ${{github.token}} \
--pr_number ${{github.event.pull_request.number}} \
--commit $GITHUB_SHA \
--run_id ${{github.run_id}}
- name: Generate API files for PR branch
run: |
python ~/api_diff_report/api_info.py \
--file_list ${{ steps.get_changed_files.outputs.file_list }} \
--output_dir ${{ env.PR_API_OUTPUT }}
- name: Checkout Base branch
run: git checkout HEAD^

- name: Generate API files for Base branch
run: |
python ~/api_diff_report/api_info.py \
--file_list ${{ steps.get_changed_files.outputs.file_list }} \
--output_dir ${{ env.BASE_API_OUTPUT }}
- name: Generate API Diff Report
run: |
python ~/api_diff_report/api_diff_report.py \
--pr_branch ${{ env.PR_API_OUTPUT }} \
--base_branch ${{ env.BASE_API_OUTPUT }} \
--output_dir ${{ env.DIFF_REPORT_OUTPUT }}
- name: Update Diff Report Comment in PR
run: |
python ~/api_diff_report/pr_commenter.py \
--stage ${{ env.STAGE_END }} \
--report ${{ env.DIFF_REPORT_OUTPUT }} \
--token ${{github.token}} \
--pr_number ${{github.event.pull_request.number}} \
--commit $GITHUB_SHA \
--run_id ${{github.run_id}}
- uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: api_info_and_report
path: ci_outputs
retention-days: 1
108 changes: 54 additions & 54 deletions .github/workflows/client_app.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
# name: client_app
name: client_app

# on:
# pull_request:
# paths:
# - ".github/workflows/client_app.yml"
# - "Package.swift"
# - ".swiftpm/*"
# - "*.podspec"
# - "scripts/install_prereqs.sh"
# - "scripts/build.sh"
# - "ClientApp/**"
# - "Gemfile*"
# schedule:
# # Run every day at 12am (PST) - cron uses UTC times
# - cron: "0 8 * * *"
on:
pull_request:
paths:
- ".github/workflows/client_app.yml"
- "Package.swift"
- ".swiftpm/*"
- "*.podspec"
- "scripts/install_prereqs.sh"
- "scripts/build.sh"
- "ClientApp/**"
- "Gemfile*"
schedule:
# Run every day at 12am (PST) - cron uses UTC times
- cron: "0 8 * * *"

# concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
# cancel-in-progress: true
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

# jobs:
# client-app-spm:
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
# env:
# FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
# runs-on: macos-12
# strategy:
# matrix:
# platform: [iOS]
# # TODO(Xcode 14.3): Remove above line and uncomment below array when GHA
# # supports Ventura/Xcode 14.3.
# # platform: [iOS, tvOS, macOS, catalyst]
# steps:
# - uses: actions/checkout@v3
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
# with:
# cache_key: ${{ matrix.os }}
# - name: Build Client App –– ${{ matrix.platform }}
# run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild
jobs:
client-app-spm:
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
env:
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
runs-on: macos-12
strategy:
matrix:
platform: [iOS]
# TODO(Xcode 14.3): Remove above line and uncomment below array when GHA
# supports Ventura/Xcode 14.3.
# platform: [iOS, tvOS, macOS, catalyst]
steps:
- uses: actions/checkout@v3
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
with:
cache_key: ${{ matrix.os }}
- name: Build Client App –– ${{ matrix.platform }}
run: scripts/third_party/travis/retry.sh ./scripts/build.sh SwiftPMClientApp ${{ matrix.platform }} xcodebuild

# # TODO(ncooke3): Re-enable when `rc-swift-merged` is ready to merge into `master`. See #11766.
# # client-app-cocoapods:
# # # 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'
# # runs-on: macos-12
# # steps:
# # - uses: actions/checkout@v3
# # - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
# # with:
# # cache_key: ${{ matrix.os }}
# # - uses: ruby/setup-ruby@v1
# # - name: Setup Bundler
# # run: scripts/setup_bundler.sh
# # - name: Prereqs
# # run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
# # - name: Build
# # run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
# TODO(ncooke3): Re-enable when `rc-swift-merged` is ready to merge into `master`. See #11766.
# client-app-cocoapods:
# # 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'
# runs-on: macos-12
# steps:
# - uses: actions/checkout@v3
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
# with:
# cache_key: ${{ matrix.os }}
# - uses: ruby/setup-ruby@v1
# - name: Setup Bundler
# run: scripts/setup_bundler.sh
# - name: Prereqs
# run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
# - name: Build
# run: scripts/build.sh CocoaPodsClientApp iOS xcodebuild
64 changes: 32 additions & 32 deletions .github/workflows/firebasepod.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# name: firebasepod
name: firebasepod

# # Verify that the Firebase.podspec will successfully `pod install`.
# Verify that the Firebase.podspec will successfully `pod install`.

# on:
# pull_request:
# paths:
# - '*.podspec'
# - 'CoreOnly/**'
# - '.github/workflows/firebasepod.yml'
# - 'Gemfile*'
# schedule:
# # Run every day at 1am (PST) - cron uses UTC times
# - cron: '0 9 * * *'
on:
pull_request:
paths:
- '*.podspec'
- 'CoreOnly/**'
- '.github/workflows/firebasepod.yml'
- 'Gemfile*'
schedule:
# Run every day at 1am (PST) - cron uses UTC times
- cron: '0 9 * * *'

# concurrency:
# group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
# cancel-in-progress: true
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
cancel-in-progress: true

# jobs:
# installation-test:
# # 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'
jobs:
installation-test:
# 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'

# runs-on: macos-12
runs-on: macos-12

# steps:
# - uses: actions/checkout@v3
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
# with:
# cache_key: ${{ matrix.os }}
# - uses: ruby/setup-ruby@v1
# - name: Setup Bundler
# run: scripts/setup_bundler.sh
# - name: Prereqs
# run: scripts/install_prereqs.sh FirebasePod iOS
# - name: Build
# run: scripts/build.sh FirebasePod iOS
steps:
- uses: actions/checkout@v3
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
with:
cache_key: ${{ matrix.os }}
- uses: ruby/setup-ruby@v1
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: Prereqs
run: scripts/install_prereqs.sh FirebasePod iOS
- name: Build
run: scripts/build.sh FirebasePod iOS
Loading

0 comments on commit 682afd2

Please sign in to comment.