Skip to content
Snippets Groups Projects

pipeline: support riscv64

Closed Imported Administrator requested to merge mrtest-riscv64 into master

Currently the Alpine CI jobs are called build-riscv64-emulated, so use the -emulated suffix also.

Merge request reports

Checking pipeline status.

Approval is optional

Closed by AdministratorAdministrator 2 years ago (Dec 7, 2022 9:12pm UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator requested review from @ollieparanoid · Imported

    requested review from @ollieparanoid

    By Luca Weiss on 2022-11-18T20:32:28

  • Administrator assigned to @ollieparanoid · Imported

    assigned to @ollieparanoid

    By Luca Weiss on 2022-11-18T20:32:28

  • Author Owner

    Pretty sure this will fix mrtest add --alpine but break it without --alpine since in pmOS it's just riscv64. Also it will break again once Alpine renames it to drop -emulated at some point.

    How about this instead (untested):

    diff --git a/mrhlpr/pipeline.py b/mrhlpr/pipeline.py
    index 34dd655..00899a1 100644
    --- a/mrhlpr/pipeline.py
    +++ b/mrhlpr/pipeline.py
    @@ -29,7 +29,7 @@ def get_build_job(api_pipeline_jobs):
         build_native = f"build-{get_arch_alpine_native()}"
     
         for job in api_pipeline_jobs:
    -        if job["name"] == build_native:
    +        if job["name"] in [build_native, f"{build_native}-emulated"]:
                 return job
     
         return None

    By Oliver Smith on 2022-11-20T14:52:45

  • Author Owner

    @z3ntu can you take another look when you have time, and also review !16 (merged)?

    By Oliver Smith on 2022-11-28T07:10:05

  • Author Owner

    Applied the proposed patch above as I'm about to tag a new release. It's trivial and solves the problem.

    By Oliver Smith on 2022-12-07T21:12:35

  • Administrator closed · Imported

    closed

  • Author Owner

    Thanks for doing that, sorry I didn't fix it myself earlier :)

    By Luca Weiss on 2022-12-09T16:50:08

Please register or sign in to reply
Loading