Skip to content

Commit c0c1a80

Browse files
dconeybedconeybe
committed
Merge remote-tracking branch 'origin/main' into TransactionOptions
2 parents 487cfe2 + 7a13328 commit c0c1a80

20 files changed

+137
-1474
lines changed

‎.github/workflows/android.yml‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

‎.github/workflows/build_android.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,26 @@ jobs:
104104
echo "ANDROID_NDK_HOME=/tmp/android-ndk-r21e" >> $GITHUB_ENV
105105
106106
- name: Install Unity installer (U3D)
107-
shell: bash
108-
run: gem install u3d -v 1.2.3
107+
uses: nick-invision/retry@v2
108+
with:
109+
timeout_minutes: 10
110+
max_attempts: 3
111+
shell: bash
112+
command: gem install u3d -v 1.2.3
109113

110114
- name: Install python deps
111115
shell: bash
112116
run: |
113117
pip install -r scripts/gha/requirements.txt
114118
115119
- name: Install Unity
116-
shell: bash
117-
run: |
118-
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
120+
uses: nick-invision/retry@v2
121+
with:
122+
timeout_minutes: 15
123+
max_attempts: 3
124+
shell: bash
125+
command: |
126+
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
119127
120128
- name: Setup Unity path
121129
shell: bash
@@ -128,6 +136,7 @@ jobs:
128136
swig -version
129137
130138
- name: Build SDK (Android)
139+
timeout-minutes: 90
131140
shell: bash
132141
run: |
133142
# TODO add handling cmake_extras

‎.github/workflows/build_ios.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,34 @@ jobs:
8383
cd ..
8484
8585
- name: Install Unity installer (U3D)
86-
shell: bash
87-
run: gem install u3d -v 1.2.3
86+
uses: nick-invision/retry@v2
87+
with:
88+
timeout_minutes: 10
89+
max_attempts: 3
90+
shell: bash
91+
command: gem install u3d -v 1.2.3
8892

8993
- name: Install python deps
9094
shell: bash
9195
run: |
9296
pip install -r scripts/gha/requirements.txt
9397
9498
- name: Install Unity
95-
shell: bash
96-
run: |
97-
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
99+
uses: nick-invision/retry@v2
100+
with:
101+
timeout_minutes: 15
102+
max_attempts: 3
103+
shell: bash
104+
command: |
105+
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
98106
99107
- name: Setup Unity path
100108
shell: bash
101109
run: |
102110
echo "UNITY_ROOT_DIR=$( python scripts/gha/print_matrix_configuration.py -u ${{ inputs.unity_version }} -k unity_path )" >> $GITHUB_ENV
103111
104112
- name: Build SDK (iOS)
113+
timeout-minutes: 90
105114
shell: bash
106115
run: |
107116
# TODO add handling cmake_extras

‎.github/workflows/build_linux.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ jobs:
6969
ruby-version: 3.0.2
7070

7171
- name: Install Unity installer (U3D)
72-
shell: bash
73-
run: gem install u3d -v 1.2.3
72+
uses: nick-invision/retry@v2
73+
with:
74+
timeout_minutes: 10
75+
max_attempts: 3
76+
shell: bash
77+
command: gem install u3d -v 1.2.3
7478

7579
- name: Setup python
7680
uses: actions/setup-python@v2
@@ -95,9 +99,13 @@ jobs:
9599
sudo apt install openssl
96100
97101
- name: Install Unity
98-
shell: bash
99-
run: |
100-
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
102+
uses: nick-invision/retry@v2
103+
with:
104+
timeout_minutes: 15
105+
max_attempts: 3
106+
shell: bash
107+
command: |
108+
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
101109
102110
- name: Setup Unity path
103111
shell: bash
@@ -108,6 +116,7 @@ jobs:
108116
echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
109117
110118
- name: Build SDK (Linux)
119+
timeout-minutes: 90
111120
shell: bash
112121
run: |
113122
# TODO add handling cmake_extras

‎.github/workflows/build_macos.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,12 @@ jobs:
6969
ruby-version: 3.0.2
7070

7171
- name: Install Unity installer (U3D)
72-
shell: bash
73-
run: gem install u3d -v 1.2.3
72+
uses: nick-invision/retry@v2
73+
with:
74+
timeout_minutes: 10
75+
max_attempts: 3
76+
shell: bash
77+
command: gem install u3d -v 1.2.3
7478

7579
- name: Setup python
7680
uses: actions/setup-python@v2
@@ -101,9 +105,13 @@ jobs:
101105
echo "OPENSSL_ROOT_DIR=$(brew --prefix openssl --installed)" >> $GITHUB_ENV
102106
103107
- name: Install Unity
104-
shell: bash
105-
run: |
106-
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
108+
uses: nick-invision/retry@v2
109+
with:
110+
timeout_minutes: 15
111+
max_attempts: 3
112+
shell: bash
113+
command: |
114+
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
107115
108116
- name: Setup Unity path
109117
shell: bash
@@ -114,6 +122,7 @@ jobs:
114122
echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
115123
116124
- name: Build SDK (MacOS)
125+
timeout-minutes: 90
117126
shell: bash
118127
run: |
119128
# TODO add handling cmake_extras

‎.github/workflows/build_starter.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ name: Firebase Unity SDK build
44
on:
55
schedule:
66
- cron: "0 7 * * *" # 7am UTC = 11pm PST / 12am PDT
7+
8+
pull_request:
9+
types: [ labeled, closed ]
710

811
workflow_dispatch:
912
inputs:
@@ -218,7 +221,6 @@ jobs:
218221
uses: ./.github/workflows/package.yml
219222
if: (needs.check_and_prepare.outputs.should_trigger_package == 'true') && !cancelled() && !failure()
220223
with:
221-
triggered_by_callable: true
222224
release_label: ${{ needs.check_and_prepare.outputs.release_label }}
223225
skipIntegrationTests: ${{ needs.check_and_prepare.outputs.skipIntegrationTests }}
224226
build_run_id: ${{ github.run_id }}

‎.github/workflows/build_windows.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,12 @@ jobs:
7272
ruby-version: 3.0.2
7373

7474
- name: Install Unity installer (U3D)
75-
shell: bash
76-
run: gem install u3d -v 1.2.3
75+
uses: nick-invision/retry@v2
76+
with:
77+
timeout_minutes: 10
78+
max_attempts: 3
79+
shell: bash
80+
command: gem install u3d -v 1.2.3
7781

7882
- name: Setup python
7983
uses: actions/setup-python@v2
@@ -101,9 +105,13 @@ jobs:
101105
choco install openssl -r
102106
103107
- name: Install Unity
104-
shell: bash
105-
run: |
106-
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
108+
uses: nick-invision/retry@v2
109+
with:
110+
timeout_minutes: 15
111+
max_attempts: 3
112+
shell: bash
113+
command: |
114+
python scripts/gha/unity_installer.py --install --platforms ${{ inputs.unity_platform_name }} --version ${{ inputs.unity_version }}
107115
108116
- name: Setup Unity path
109117
shell: bash
@@ -114,6 +122,7 @@ jobs:
114122
echo "SWIG_DIR=$(swig -swiglib)" >> $GITHUB_ENV
115123
116124
- name: Build SDK (Windows)
125+
timeout-minutes: 90
117126
shell: bash
118127
run: |
119128
# TODO add handling cmake_extras

0 commit comments

Comments
 (0)