mirror of
https://github.com/servo/servo.git
synced 2025-06-11 10:00:18 +00:00
ci: fix reference to android job filename in main.yml (#31150)
* ci: fix reference to android job filename in main.yml * mach: fix build command to handle android The refactoring done in PR #31092 introduced the call to get_binary_path in the unconditional path, but did not pass the android flag to the call. Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com> --------- Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
parent
33500ed05f
commit
cf5d9c7a28
2 changed files with 8 additions and 2 deletions
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
@ -129,7 +129,7 @@ jobs:
|
||||||
name: Android
|
name: Android
|
||||||
needs: ["decision"]
|
needs: ["decision"]
|
||||||
if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'android') }}
|
if: ${{ contains(fromJson(needs.decision.outputs.configuration).platforms, 'android') }}
|
||||||
uses: ./.github/workflows/linux.yml
|
uses: ./.github/workflows/android.yml
|
||||||
with:
|
with:
|
||||||
profile: "release"
|
profile: "release"
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
|
@ -104,7 +104,13 @@ class MachCommands(CommandBase):
|
||||||
)
|
)
|
||||||
|
|
||||||
# Do some additional things if the build succeeded
|
# Do some additional things if the build succeeded
|
||||||
built_binary = self.get_binary_path(build_type, target=self.cross_compile_target, simpleservo=libsimpleservo)
|
built_binary = self.get_binary_path(
|
||||||
|
build_type,
|
||||||
|
target=self.cross_compile_target,
|
||||||
|
android=self.is_android_build,
|
||||||
|
simpleservo=libsimpleservo
|
||||||
|
)
|
||||||
|
|
||||||
if status == 0:
|
if status == 0:
|
||||||
if self.is_android_build and not no_package:
|
if self.is_android_build and not no_package:
|
||||||
flavor = None
|
flavor = None
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue