Add a merge step to our Jenkins ISO build process
In our automatic builds specs, we designed that we wanted the build of feature branches to be done after it has been merged locally in their base branch.
We still need to implement this, as at the moment we only build from the feature branch.
This will probably mean modifying our
#3 Updated by bertagaz 2015-06-17 06:30:01
- Assignee changed from bertagaz to intrigeri
We’ll probably need to use some of the
auto/scripts/tails-custom-apt-sources functions in the
vagrant/provision/assets/build-tails script, namely base_branch and friends.
To avoid code duplication we should put this functions in a separate shell lib.
I guess the best place is in the lib/ folder of the Tails repo, where the pythonlib already lay.
We should create a
lib/shell folder in the Tails git repo, but is it required to create a dedicated submodule as the pythonlib? Or should we wait until it grows?