Skip to content
Snippets Groups Projects

Rebase LTS/ELTS changes on top of the Salsa CI's pipeline as of 2024-04-23

Closed Santiago R.R. requested to merge rebase-2024-04-23 into master
1 unresolved thread

This MR overrides !12 (closed)

My goal with this MR is to simplify and squash the commits, keeping in mind to parts of code that could be merged upstream.

I gave up the idea of doing a "clean" rebase, as it was my goal with !12 (closed) (we are "88 commits behind, 118 commits ahead"). It is too complex and we don't gain too much. I haven't been able to finish that since last November, so just let's make it simple. We need to import some changes from upstream to fix long-standing issues in our fork.

Merge request reports

Pipeline #671918 failed

Pipeline: pipeline

#671919

    Pipeline: pipeline

    #671963

      Pipeline: pipeline

      #671964

        +1

        Pipeline failed for eec3a1f7 on rebase-2024-04-23

        Approval is optional
        Ready to merge by members who can write to the target branch.

        Activity

        Filter activity
        • Approvals
        • Assignees & reviewers
        • Comments (from bots)
        • Comments (from users)
        • Commits & branches
        • Edits
        • Labels
        • Lock status
        • Mentions
        • Merge request status
        • Tracking
        385 385 elif [ "$DB_BUILD_TYPE" = "all" ]; then
        386 386 JESSIE_BUILD_OPTION=-A
        387 387 fi
        388 BUILD_COMMAND="${BUILD_COMMAND} ${JESSIE_BUILD_OPTION} ${DB_BUILD_PARAM}"
        388 fi
        389 BUILD_COMMAND="${BUILD_COMMAND} ${JESSIE_BUILD_OPTION} ${DB_BUILD_PARAM}"
        389 390
        • This change seems wrong. JESSIE_BUILD_OPTION is not defined outside the $RELEASE = jessie if block. There, BUILD_COMMAND is defined in line 375 as test "$RELEASE" != "jessie" && BUILD_COMMAND="${BUILD_COMMAND} --build=${DB_BUILD_TYPE} ${DB_BUILD_PARAM}"

        • Please register or sign in to reply
        Please register or sign in to reply
        Loading