CI: Update build job to work after another common pipeline change

salsa-ci-team/pipeline@bfa96b78 "Don't rebuild source package in sbuild" changed things around so that the packed source package is expected to be generated in ${BUILD_DIR}. A new command in .build-script-run-build-command moves it to the artifact directory ${WORKING_DIR} after building binary packages. Additionally it's expected that the current directory at this point is a subdirectory of ${BUILD_DIR}.

Our build and build-signed jobs always put the source package in ${WORKING_DIR} before including .build-script-run-build-command, so the second move fails. They also keep the current directory set to the Git working tree.

Change these jobs to:

  • Put the cached orig tarball (build only), packed and unpacked source package in ${BUILD_DIR}
  • Set current directory to the unpacked source package under ${BUILD_DIR}
  • Make ${BUILD_DIR} owned by the build user
  • Leave the sbuild command line unchanged

In the build job, keep moving the buildinfo and changes file into ${WORKING_DIR}, which the common pipeline currently doesn't do, but allow this to fail in case that changes.

Edited by Ben Hutchings

Merge request reports

Loading