8989 if [[ "${{ inputs.triggered_by_callable }}" == "true" ]]; then
9090 # Triggered by callable
9191 echo "::set-output name=use_new_build::'1'"
92+ echo "::set-output name=workflow_conclusion::in_progress"
9293 echo "::set-output name=skipIntegrationTests::${{ inputs.skipIntegrationTests }}"
9394 echo "::set-output name=create_new_branch::${{ inputs.create_new_branch }}"
9495 echo "::set-output name=release_label::${{ inputs.release_label }}"
@@ -100,6 +101,7 @@ jobs:
100101 echo "::set-output name=download_windows_run::${{ inputs.build_run_id }}"
101102 else
102103 echo "::set-output name=use_new_build::${{ github.event.inputs.use_new_build }}"
104+ echo "::set-output name=workflow_conclusion::success"
103105 echo "::set-output name=skipIntegrationTests::${{ github.event.inputs.skipIntegrationTests }}"
104106 echo "::set-output name=create_new_branch::${{ github.event.inputs.create_new_branch }}"
105107 echo "::set-output name=release_label::${{ github.event.inputs.release_label }}"
@@ -116,6 +118,7 @@ jobs:
116118 run : |
117119 echo triggered_by_callable: ${{ inputs.triggered_by_callable }}
118120 echo use_new_build: ${{ steps.decide_input.outputs.use_new_build }}
121+ echo workflow_conclusion: ${{ steps.decide_input.outputs.workflow_conclusion }}
119122 echo skipIntegrationTests: ${{ steps.decide_input.outputs.skipIntegrationTests }}
120123 echo create_new_branch: ${{ steps.decide_input.outputs.create_new_branch }}
121124 echo release_label: ${{ steps.decide_input.outputs.release_label }}
@@ -175,74 +178,117 @@ jobs:
175178 git checkout ${{ steps.decide_input.outputs.working_branch }}
176179 echo "UPDATE_LOGFILE=update_log.txt" >> $GITHUB_ENV
177180 echo "NEW_BRANCH=${{ steps.decide_input.outputs.working_branch }}" >> $GITHUB_ENV
178-
179- - name : Set Fetch Workflow name
180- id : set-fetch-workflow
181- shell : bash
182- run : |
183- if [[ "${{ steps.decide_input.outputs.use_new_build }}" == "1" ]]; then
184- # all use build_starter.yml
185- echo "::set-output name=android_yml::'build_starter.yml'"
186- echo "::set-output name=ios_yml::'build_starter.yml'"
187- echo "::set-output name=linux_yml::'build_starter.yml'"
188- echo "::set-output name=macos_yml::'build_starter.yml'"
189- echo "::set-output name=windows_yml::'build_starter.yml'"
190- else
191- echo "::set-output name=android_yml::'android.yml'"
192- echo "::set-output name=ios_yml::'ios.yml'"
193- echo "::set-output name=linux_yml::'sdk_build.yml'"
194- echo "::set-output name=macos_yml::'sdk_build.yml'"
195- echo "::set-output name=windows_yml::'sdk_build.yml'"
196- fi
197181
198- - name : Fetch Android Artifacts
182+ - name : Fetch Android Artifacts (OLD)
199183 uses : dawidd6/action-download-artifact@v2
200184 continue-on-error : true
185+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='0')
201186 with :
202- workflow : ${{ steps.set-fetch-workflow.outputs.android_yml }}
187+ workflow : android.yml
203188 run_id : ${{ steps.decide_input.outputs.download_android_run }}
204189 name : android_unity
205- path : built_artifect
190+ path : built_artifact
206191
207- - name : Fetch iOS Artifacts
192+ - name : Fetch iOS Artifacts (OLD)
208193 uses : dawidd6/action-download-artifact@v2
209194 continue-on-error : true
195+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='0')
210196 with :
211- workflow : ${{ steps.set-fetch-workflow.outputs.ios_yml }}
197+ workflow : ios.yml
212198 run_id : ${{ steps.decide_input.outputs.download_ios_run }}
213199 name : ios_unity
214- path : built_artifect
200+ path : built_artifact
215201
216- - name : Fetch Linux Artifacts
202+ - name : Fetch Linux Artifacts (OLD)
217203 uses : dawidd6/action-download-artifact@v2
218204 continue-on-error : true
205+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='0')
219206 with :
220- workflow : ${{ steps.set-fetch-workflow.outputs.linux_yml }}
207+ workflow : sdk_build.yml
221208 run_id : ${{ steps.decide_input.outputs.download_linux_run }}
222209 name : linux_unity
223- path : built_artifect
210+ path : built_artifact
224211
225- - name : Fetch MacOS Artifacts
212+ - name : Fetch MacOS Artifacts (OLD)
226213 uses : dawidd6/action-download-artifact@v2
227214 continue-on-error : true
215+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='0')
228216 with :
229- workflow : ${{ steps.set-fetch-workflow.outputs.macos_yml }}
217+ workflow : sdk_build.yml
230218 run_id : ${{ steps.decide_input.outputs.download_macos_run }}
231219 name : macos_unity
232- path : built_artifect
220+ path : built_artifact
233221
234- - name : Fetch Windows Artifacts
222+ - name : Fetch Windows Artifacts (OLD)
235223 uses : dawidd6/action-download-artifact@v2
236224 continue-on-error : true
225+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='0')
237226 with :
238- workflow : ${{ steps.set-fetch-workflow.outputs.windows_yml }}
227+ workflow : sdk_build.yml
239228 run_id : ${{ steps.decide_input.outputs.download_windows_run }}
240229 name : windows_unity
241- path : built_artifect
230+ path : built_artifact
231+
232+ - name : Fetch Android Artifacts (NEW)
233+ uses : dawidd6/action-download-artifact@v2
234+ continue-on-error : true
235+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='1')
236+ with :
237+ workflow : build_starter.yml
238+ run_id : ${{ steps.decide_input.outputs.download_android_run }}
239+ name : android_unity
240+ path : built_artifact
241+
242+ - name : Fetch iOS Artifacts (NEW)
243+ uses : dawidd6/action-download-artifact@v2
244+ continue-on-error : true
245+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='1')
246+ with :
247+ workflow : build_starter.yml
248+ run_id : ${{ steps.decide_input.outputs.download_ios_run }}
249+ name : ios_unity
250+ path : built_artifact
251+
252+ - name : Fetch Linux Artifacts (NEW)
253+ uses : dawidd6/action-download-artifact@v2
254+ continue-on-error : true
255+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='1')
256+ with :
257+ workflow : build_starter.yml
258+ run_id : ${{ steps.decide_input.outputs.download_linux_run }}
259+ name : linux_unity
260+ path : built_artifact
261+
262+ - name : Fetch MacOS Artifacts (NEW)
263+ uses : dawidd6/action-download-artifact@v2
264+ continue-on-error : true
265+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='1')
266+ with :
267+ workflow : build_starter.yml
268+ run_id : ${{ steps.decide_input.outputs.download_macos_run }}
269+ name : macos_unity
270+ path : built_artifact
271+
272+ - name : Fetch Windows Artifacts (NEW)
273+ uses : dawidd6/action-download-artifact@v2
274+ continue-on-error : true
275+ if : (inputs.triggered_by_callable==false) && (steps.decide_input.outputs.use_new_build=='1')
276+ with :
277+ workflow : build_starter.yml
278+ run_id : ${{ steps.decide_input.outputs.download_windows_run }}
279+ name : windows_unity
280+ path : built_artifact
281+
282+ # If called by build_start.xml, ignore name search, just grab all artifact exists
283+ - name : Fetch All in build_starter
284+ uses : actions/download-artifact@v3
285+ if : inputs.triggered_by_callable==true
286+ with :
287+ path : built_artifact
242288
243289 - name : move zip files
244290 run : |
245- cd built_artifect
291+ cd built_artifact
246292 find . -type f -name "*.zip" -exec mv {} . \;
247293 find . -empty -type d -delete
248294 ls -lR
@@ -255,7 +301,7 @@ jobs:
255301
256302 - name : Package unitypackage
257303 run : |
258- python build_package.py --zip_dir=built_artifect
304+ python build_package.py --zip_dir=built_artifact
259305
260306 - name : Commit Changes if there is any
261307 run : |
@@ -330,7 +376,7 @@ jobs:
330376
331377 - name : Package tgz
332378 run : |
333- python build_package.py --zip_dir=built_artifect --output_upm=True --output=output_tgz
379+ python build_package.py --zip_dir=built_artifact --output_upm=True --output=output_tgz
334380
335381 - name : Listing output tgz
336382 run : |
0 commit comments