actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-11 21:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename master to main.

Browse Source
This commit is contained in:
TingluoHuang
2020-07-14 13:37:20 -04:00
parent 5e0cde8649
commit 2709cbc0ea
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -3,7 +3,7 @@ name: Runner CI
on: on:
push: push:
branches: branches:
- master - main
- releases/* - releases/*
paths-ignore: paths-ignore:
- '**.md' - '**.md'

2
.github/workflows/release.yml vendored
View File

@@ -7,7 +7,7 @@ on:
jobs: jobs:
check: check:
if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/master' if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

40
src/Test/L0/Worker/ActionManagerL0.cs
View File

@@ -133,7 +133,7 @@ namespace GitHub.Runner.Common.Tests.Worker
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = ActionName, Name = ActionName,
Ref = "master", Ref = "main",
RepositoryType = "GitHub" RepositoryType = "GitHub"
} }
} }
@@ -141,7 +141,7 @@ namespace GitHub.Runner.Common.Tests.Worker
// Return a valid action from GHES via mock // Return a valid action from GHES via mock
const string ApiUrl = "https://ghes.example.com/api/v3"; const string ApiUrl = "https://ghes.example.com/api/v3";
string expectedArchiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "master"); string expectedArchiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "main");
string archiveFile = await CreateRepoArchive(); string archiveFile = await CreateRepoArchive();
using var stream = File.OpenRead(archiveFile); using var stream = File.OpenRead(archiveFile);
var mockClientHandler = new Mock<HttpClientHandler>(); var mockClientHandler = new Mock<HttpClientHandler>();
@@ -159,10 +159,10 @@ namespace GitHub.Runner.Common.Tests.Worker
await _actionManager.PrepareActionsAsync(_ec.Object, actions); await _actionManager.PrepareActionsAsync(_ec.Object, actions);
//Assert //Assert
var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master.completed"); var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main.completed");
Assert.True(File.Exists(watermarkFile)); Assert.True(File.Exists(watermarkFile));
var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master", "action.yml"); var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main", "action.yml");
Assert.True(File.Exists(actionYamlFile)); Assert.True(File.Exists(actionYamlFile));
_hc.GetTrace().Info(File.ReadAllText(actionYamlFile)); _hc.GetTrace().Info(File.ReadAllText(actionYamlFile));
} }
@@ -191,7 +191,7 @@ namespace GitHub.Runner.Common.Tests.Worker
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = ActionName, Name = ActionName,
Ref = "master", Ref = "main",
RepositoryType = "GitHub" RepositoryType = "GitHub"
} }
} }
@@ -199,8 +199,8 @@ namespace GitHub.Runner.Common.Tests.Worker
// Return a valid action from GHES via mock // Return a valid action from GHES via mock
const string ApiUrl = "https://ghes.example.com/api/v3"; const string ApiUrl = "https://ghes.example.com/api/v3";
string builtInArchiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "master"); string builtInArchiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "main");
string dotcomArchiveLink = GetLinkToActionArchive("https://api.github.com", ActionName, "master"); string dotcomArchiveLink = GetLinkToActionArchive("https://api.github.com", ActionName, "main");
string archiveFile = await CreateRepoArchive(); string archiveFile = await CreateRepoArchive();
using var stream = File.OpenRead(archiveFile); using var stream = File.OpenRead(archiveFile);
var mockClientHandler = new Mock<HttpClientHandler>(); var mockClientHandler = new Mock<HttpClientHandler>();
@@ -220,10 +220,10 @@ namespace GitHub.Runner.Common.Tests.Worker
await _actionManager.PrepareActionsAsync(_ec.Object, actions); await _actionManager.PrepareActionsAsync(_ec.Object, actions);
//Assert //Assert
var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master.completed"); var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main.completed");
Assert.True(File.Exists(watermarkFile)); Assert.True(File.Exists(watermarkFile));
var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master", "action.yml"); var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main", "action.yml");
Assert.True(File.Exists(actionYamlFile)); Assert.True(File.Exists(actionYamlFile));
_hc.GetTrace().Info(File.ReadAllText(actionYamlFile)); _hc.GetTrace().Info(File.ReadAllText(actionYamlFile));
} }
@@ -252,7 +252,7 @@ namespace GitHub.Runner.Common.Tests.Worker
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = ActionName, Name = ActionName,
Ref = "master", Ref = "main",
RepositoryType = "GitHub" RepositoryType = "GitHub"
} }
} }
@@ -260,7 +260,7 @@ namespace GitHub.Runner.Common.Tests.Worker
// Return a valid action from GHES via mock // Return a valid action from GHES via mock
const string ApiUrl = "https://ghes.example.com/api/v3"; const string ApiUrl = "https://ghes.example.com/api/v3";
string archiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "master"); string archiveLink = GetLinkToActionArchive(ApiUrl, ActionName, "main");
string archiveFile = await CreateRepoArchive(); string archiveFile = await CreateRepoArchive();
using var stream = File.OpenRead(archiveFile); using var stream = File.OpenRead(archiveFile);
var mockClientHandler = new Mock<HttpClientHandler>(); var mockClientHandler = new Mock<HttpClientHandler>();
@@ -280,10 +280,10 @@ namespace GitHub.Runner.Common.Tests.Worker
//Assert //Assert
await Assert.ThrowsAsync<ActionNotFoundException>(action); await Assert.ThrowsAsync<ActionNotFoundException>(action);
var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master.completed"); var watermarkFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main.completed");
Assert.False(File.Exists(watermarkFile)); Assert.False(File.Exists(watermarkFile));
var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "master", "action.yml"); var actionYamlFile = Path.Combine(_hc.GetDirectory(WellKnownDirectory.Actions), ActionName, "main", "action.yml");
Assert.False(File.Exists(actionYamlFile)); Assert.False(File.Exists(actionYamlFile));
} }
finally finally
@@ -1278,7 +1278,7 @@ runs:
"; ";
Pipelines.ActionStep instance; Pipelines.ActionStep instance;
string directory; string directory;
directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master"); directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "main");
string file = Path.Combine(directory, Constants.Path.ActionManifestYamlFile); string file = Path.Combine(directory, Constants.Path.ActionManifestYamlFile);
Directory.CreateDirectory(Path.GetDirectoryName(file)); Directory.CreateDirectory(Path.GetDirectoryName(file));
File.WriteAllText(file, Content); File.WriteAllText(file, Content);
@@ -1288,7 +1288,7 @@ runs:
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = "GitHub/actions", Name = "GitHub/actions",
Ref = "master", Ref = "main",
RepositoryType = Pipelines.RepositoryTypes.GitHub RepositoryType = Pipelines.RepositoryTypes.GitHub
} }
}; };
@@ -2898,7 +2898,7 @@ runs:
"; ";
Pipelines.ActionStep instance; Pipelines.ActionStep instance;
string directory; string directory;
directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master"); directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "main");
string file = Path.Combine(directory, Constants.Path.ActionManifestYamlFile); string file = Path.Combine(directory, Constants.Path.ActionManifestYamlFile);
Directory.CreateDirectory(Path.GetDirectoryName(file)); Directory.CreateDirectory(Path.GetDirectoryName(file));
File.WriteAllText(file, Content); File.WriteAllText(file, Content);
@@ -2908,7 +2908,7 @@ runs:
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = "GitHub/actions", Name = "GitHub/actions",
Ref = "master", Ref = "main",
RepositoryType = Pipelines.RepositoryTypes.GitHub RepositoryType = Pipelines.RepositoryTypes.GitHub
} }
}; };
@@ -3453,7 +3453,7 @@ runs:
private void CreateAction(string yamlContent, out Pipelines.ActionStep instance, out string directory) private void CreateAction(string yamlContent, out Pipelines.ActionStep instance, out string directory)
{ {
directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "master"); directory = Path.Combine(_workFolder, Constants.Path.ActionsDirectory, "GitHub/actions".Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar), "main");
string file = Path.Combine(directory, Constants.Path.ActionManifestYmlFile); string file = Path.Combine(directory, Constants.Path.ActionManifestYmlFile);
Directory.CreateDirectory(Path.GetDirectoryName(file)); Directory.CreateDirectory(Path.GetDirectoryName(file));
File.WriteAllText(file, yamlContent); File.WriteAllText(file, yamlContent);
@@ -3463,7 +3463,7 @@ runs:
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = "GitHub/actions", Name = "GitHub/actions",
Ref = "master", Ref = "main",
RepositoryType = Pipelines.RepositoryTypes.GitHub RepositoryType = Pipelines.RepositoryTypes.GitHub
} }
}; };
@@ -3481,7 +3481,7 @@ runs:
Reference = new Pipelines.RepositoryPathReference() Reference = new Pipelines.RepositoryPathReference()
{ {
Name = "GitHub/actions", Name = "GitHub/actions",
Ref = "master", Ref = "main",
RepositoryType = Pipelines.PipelineConstants.SelfAlias RepositoryType = Pipelines.PipelineConstants.SelfAlias
} }
}; };

4
src/Test/L0/Worker/ActionManifestManagerL0.cs
View File

@@ -717,7 +717,7 @@ namespace GitHub.Runner.Common.Tests.Worker
_ec.Object.ExpressionValues["github"] = new DictionaryContextData _ec.Object.ExpressionValues["github"] = new DictionaryContextData
{ {
{ "ref", new StringContextData("refs/heads/master") }, { "ref", new StringContextData("refs/heads/main") },
}; };
_ec.Object.ExpressionValues["strategy"] = new DictionaryContextData(); _ec.Object.ExpressionValues["strategy"] = new DictionaryContextData();
_ec.Object.ExpressionValues["matrix"] = new DictionaryContextData(); _ec.Object.ExpressionValues["matrix"] = new DictionaryContextData();
@@ -737,7 +737,7 @@ namespace GitHub.Runner.Common.Tests.Worker
result = actionManifest.EvaluateDefaultInput(_ec.Object, "testInput", new BasicExpressionToken(null, null, null, "github.ref")); result = actionManifest.EvaluateDefaultInput(_ec.Object, "testInput", new BasicExpressionToken(null, null, null, "github.ref"));
//Assert //Assert
Assert.Equal("refs/heads/master", result); Assert.Equal("refs/heads/main", result);
} }
finally finally
{ {