Breezy

Merge lp:~jelmer/brz/install-merge3 into lp:brz

  1. install-merge3
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/install-merge3
Merge into: lp:brz
Diff against target: 25 lines (+2/-2)
2 files modified
.github/workflows/pythonpackage.yml (+1/-1)
byov.conf (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/install-merge3
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+426595@code.launchpad.net

Commit message

Install merge3 in CI.

Description of the change

Install merge3 in CI.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.github/workflows/pythonpackage.yml'
2--- .github/workflows/pythonpackage.yml 2022-07-09 11:29:26 +0000
3+++ .github/workflows/pythonpackage.yml 2022-07-09 12:59:39 +0000
4@@ -33,7 +33,7 @@
5 run: |
6 python -m pip install --upgrade pip
7 pip install -U pip setuptools
8- pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich setuptools-rust pyyaml
9+ pip install -U pip coverage codecov flake8 testtools paramiko fastbencode fastimport configobj cython testscenarios six docutils $TEST_REQUIRE sphinx sphinx_epytext launchpadlib patiencediff pyinotify git+https://github.com/dulwich/dulwich setuptools-rust pyyaml merge3
10 - name: Build docs
11 run: |
12 make docs PYTHON=python
13
14=== modified file 'byov.conf'
15--- byov.conf 2022-07-09 11:29:26 +0000
16+++ byov.conf 2022-07-09 12:59:39 +0000
17@@ -22,7 +22,7 @@
18 vm.packages = {brz.build_deps}, {subunit.build_deps}, bzr, git, python-junitxml
19 [brz-xenial]
20 vm.release = bionic
21-byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython setuptools-rust sphinx paramiko && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
22+byoci.setup.command = (pip3 install --upgrade pip && pip3 install --upgrade cython setuptools-rust sphinx paramiko merge3 && {subunit.clone} && {flake8.install3} && PATH="$HOME/.local/bin:$PATH" python3 setup.py develop --user && pip3 install -e '.[{brz.extras}]')
23 # FIXME: bzr log -l2 should be by default -- vila 2018-03-09
24 byoci.tests.command = bash -o pipefail -c "bzr log -l2 && PYTHONPATH=tools:$PYTHONPATH python3 -m flake8 && PYTHONPATH=../subunit/python:$PYTHONPATH PATH=../subunit/filters:$HOME/.local/bin:$PATH make check-ci | subunit2junitxml -o ../results.xml -f | subunit2pyunit"
25 [brz-cosmic]

Subscribers

People subscribed via source and target branches