Skip to content

Commit d550a72

Browse files
authored
Use GoogleAppMeasurement main branch instead of release tag for CI (#8426)
1 parent 7633a59 commit d550a72

File tree

3 files changed

+28
-0
lines changed

3 files changed

+28
-0
lines changed

Package.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ let package = Package(
143143
.package(
144144
name: "GoogleAppMeasurement",
145145
url: "https://github.com/google/GoogleAppMeasurement.git",
146+
// Please keep the version specification aligned with
147+
// scripts/setup_spm_test_app_measurement.sh.
146148
.exact("8.3.1")
147149
),
148150
.package(

scripts/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,7 @@ case "$product-$platform-$method" in
648648

649649
# Note that the combine tests require setting the minimum iOS and tvOS version to 13.0
650650
*-*-spm)
651+
"${scripts_dir}/setup_spm_test_app_measurement.sh"
651652
RunXcodebuild \
652653
-scheme $product \
653654
"${xcb_flags[@]}" \
@@ -657,6 +658,7 @@ case "$product-$platform-$method" in
657658
;;
658659

659660
*-*-spmbuildonly)
661+
"${scripts_dir}/setup_spm_test_app_measurement.sh"
660662
RunXcodebuild \
661663
-scheme $product \
662664
"${xcb_flags[@]}" \
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
# Copyright 2021 Google LLC
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
18+
# Point SPM CI to the tip of main of https://github.com/google/GoogleAppMeasurement
19+
# so that the release process can defer publish the GoogleAppMeasurement tag
20+
# until after testing.
21+
22+
# For example: Change `.exact("8.3.1")` to `.branch("main")`
23+
24+
sed -i '' 's#exact("[0-9.]*#branch("main#' Package.swift

0 commit comments

Comments
 (0)