firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ref (#56721)

Browse Source
This commit is contained in:
Christopher Fujino 2020-05-11 12:05:02 -07:00 committed by GitHub
parent 9bec7e9034
commit 3e31dbd29d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/tools/lib/roll_dev.dart
View File

@ -96,7 +96,7 @@ bool run({
git.run('fetch $origin', 'fetch $origin'); git.run('fetch $origin', 'fetch $origin');
git.run('reset $commit --hard', 'reset to the release commit'); git.run('reset $commit --hard', 'reset to the release commit');
String version = getFullTag(git); String version = getFullTag(git, origin);
version = incrementLevel(version, level); version = incrementLevel(version, level);
@ -177,10 +177,10 @@ ArgResults parseArguments(ArgParser argParser, List<String> args) {
} }
/// Obtain the version tag of the previous dev release. /// Obtain the version tag of the previous dev release.
String getFullTag(Git git) { String getFullTag(Git git, String remote) {
const String glob = '*.*.*-*.*.pre'; const String glob = '*.*.*-*.*.pre';
// describe the latest dev release // describe the latest dev release
const String ref = 'refs/heads/dev'; final String ref = 'refs/remotes/$remote/dev';
return git.getOutput( return git.getOutput(
'describe --match $glob --exact-match --tags $ref', 'describe --match $glob --exact-match --tags $ref',
'obtain last released version number', 'obtain last released version number',

6
dev/tools/test/roll_dev_test.dart
View File

@ -136,7 +136,7 @@ void main() {
when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote); when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
when(mockGit.getOutput('status --porcelain', any)).thenReturn(''); when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
when(mockGit.getOutput( when(mockGit.getOutput(
'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev', 'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
any, any,
)).thenReturn('1.2.3-0.0.pre'); )).thenReturn('1.2.3-0.0.pre');
fakeArgResults = FakeArgResults( fakeArgResults = FakeArgResults(
@ -161,7 +161,7 @@ void main() {
when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote); when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
when(mockGit.getOutput('status --porcelain', any)).thenReturn(''); when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
when(mockGit.getOutput( when(mockGit.getOutput(
'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev', 'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
any, any,
)).thenReturn('1.2.3-0.0.pre'); )).thenReturn('1.2.3-0.0.pre');
when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit); when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit);
@ -188,7 +188,7 @@ void main() {
when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote); when(mockGit.getOutput('remote get-url $origin', any)).thenReturn(kUpstreamRemote);
when(mockGit.getOutput('status --porcelain', any)).thenReturn(''); when(mockGit.getOutput('status --porcelain', any)).thenReturn('');
when(mockGit.getOutput( when(mockGit.getOutput(
'describe --match *.*.*-*.*.pre --exact-match --tags refs/heads/dev', 'describe --match *.*.*-*.*.pre --exact-match --tags refs/remotes/$origin/dev',
any, any,
)).thenReturn('1.2.3-0.0.pre'); )).thenReturn('1.2.3-0.0.pre');
when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit); when(mockGit.getOutput('rev-parse HEAD', any)).thenReturn(commit);