Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
T
tails
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 944
    • Issues 944
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 13
    • Merge Requests 13
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • tails
  • tails
  • Issues
  • #14459

Closed
Open
Opened Aug 28, 2017 by intrigeri@intrigeriMaintainer

Some branches fail to build an ISO because we merge their base branch too late

Originally created by @intrigeri on #14459 (Redmine)

Our ISO build system errors out when building from a branch based on master:

> + apt-snapshots-serials prepare-build
> + apt-mirror debian
> Not building from a tag, but last version in changelog was released
> + DEBIAN_MIRROR=
> + apt-mirror debian-security
> Not building from a tag, but last version in changelog was released
> + DEBIAN_SECURITY_MIRROR=
> + apt-mirror torproject
> Not building from a tag, but last version in changelog was released
> + TORPROJECT_MIRROR=
> + [ -n  ]
> + exit 1

I believe this is caused by auto/config running apt-snapshots-serials prepare-build before auto/build had a chance to merge the base branch (generally: stable) into the topic branch that’s being built: a branch based on master generally satisfies the “Not building from a tag, but last version in changelog was released” error condition until their base branch is merged into it.

The simplest, ad-hoc fix would probably be to move a chunk of code from auto/config to auto/build. I’ll handle this.

But thinking about the root cause, a more fundamental issue becomes obvious: merging the base branch happens too late, and by running a fair amount of (build) code before we do that, we create a frankenstein ISO whose build system partly comes from the current status of the topic branch, and partly comes from the current status of it base branch. IMO we should do the base branch merge first thing in the build process, in a manner that’s isolated from other build steps, so that all build code (including Rakefile) except the tiny script that performs the merge will be. anonym, bertagaz: if you agree we have a fundamental problem here, please file a ticket about it.

Feature Branch: bugfix/14459-merge-base-branch-earlier

Related issues

  • Related to #12557
  • Related to #14857 (closed)
  • Blocks #11355 (closed)
  • Blocks #13234 (closed)
  • Blocks #12641 (closed)
Edited May 15, 2020 by intrigeri
To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information
Assignee
Assign to
Tails_3.2
Milestone
Tails_3.2 (Past due)
Assign milestone
Time tracking
None
Due date
None
Reference: tails/tails#14459