Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-13 19:04:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

ci: fix reference to android job filename in main.yml (#31150)

Browse source 
* 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:
Mukilan Thiyagarajan 2024-01-23 11:07:33 +05:30 • committed by GitHub
parent 33500ed05f
commit cf5d9c7a28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View file

@ -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

8
python/servo/build_commands.py
View file

@ -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