Merge ~troyanov/maas:fix-snap-requirements into maas:master

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 95c35f03d32202fe77469df0b533193083e61e3d
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:fix-snap-requirements
Merge into: maas:master
Diff against target: 8 lines (+1/-1)
1 file modified
snap/local/requirements.txt (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Christian Grabowski Approve
Review via email: mp+433072@code.launchpad.net

Commit message

fix: github.com/Supervisor/supervisor master->main

Description of the change

It seems that `master` branch is no longer there, so when trying to run
`make snap-tree` the following error occurs:

:: Collecting supervisor
:: Cloning https://github.com/Supervisor/supervisor (to revision master) to /tmp/pip-install-jva08zy_/supervisor_7d49fb8c4b9f40d7b8d47d430d9d7a22
:: Running command git clone --filter=blob:none --quiet https://github.com/Supervisor/supervisor /tmp/pip-install-jva08zy_/supervisor_7d49fb8c4b9f40d7b8d47d430d9d7a22
:: WARNING: Did not find branch or tag 'master', assuming revision or ref.
:: Running command git checkout -q master
:: error: pathspec 'master' did not match any file(s) known to git
:: error: subprocess-exited-with-error

To post a comment you must log in.
Revision history for this message
Christian Grabowski (cgrabowski) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-snap-requirements lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1364/consoleText
COMMIT: e9eb051f430f0ca686d24416a4ddc5ff76c793d2

review: Needs Fixing
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-snap-requirements lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1369/consoleText
COMMIT: e9eb051f430f0ca686d24416a4ddc5ff76c793d2

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-snap-requirements lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 95c35f03d32202fe77469df0b533193083e61e3d

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/local/requirements.txt b/snap/local/requirements.txt
2index 60d3794..3532632 100644
3--- a/snap/local/requirements.txt
4+++ b/snap/local/requirements.txt
5@@ -1,2 +1,2 @@
6 pyvmomi==6.0.0.2016.6
7-git+https://github.com/Supervisor/supervisor@master#egg=supervisor
8+git+https://github.com/Supervisor/supervisor@main#egg=supervisor

Subscribers

People subscribed via source and target branches