Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spelling #253

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ If your change is small or you have already made the change, please go ahead and

For other changes, please raise an issue first to check that the change aligns with our plan for the product. We ask this to avoid disappointment and wasted effort if it does not.

If your pull request or proposed change is for a bug that is causing problems for you, please also [contact support](http://octopusdeploy.com/support) referencing your pull request to make sure it gets prioritized properly. They may also be able to find a work around in the meantime.
If your pull request or proposed change is for a bug that is causing problems for you, please also [contact support](http://octopusdeploy.com/support) referencing your pull request to make sure it gets prioritized properly. They may also be able to find a workaround in the meantime.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the noun form (which compounds)


If you have an idea or a feature request, please post it to [our UserVoice site](http://octopusdeploy.uservoice.com) so others can vote for it.

Expand Down
2 changes: 1 addition & 1 deletion BuildAssets/test-linux-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fi

if [[ "$OSRELID" == "fedora" ]]; then
echo "Fedora detected. Setting DOTNET_BUNDLE_EXTRACT_BASE_DIR to $(pwd)/dotnet-extraction-dir"
# to workaround error
# to work around error
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the verb form (which doesn't compound)

# realpath(): Operation not permitted
# Failure processing application bundle.
# Failed to determine location for extracting embedded files
Expand Down
6 changes: 3 additions & 3 deletions source/Octo.Tests/Commands/ReleasePlanBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public void NoPackageOrScriptSteps_ShouldNotBeViable()
}

[Test]
public void DisabledScriptSteps_ShouldNotBeAViablePlan()
public void DisabledScriptSteps_ShouldNotBeAvailablePlan()
{
// arrange
var deploymentStepResource = ResourceBuilderHelpers.GetStep();
Expand All @@ -146,7 +146,7 @@ public void DisabledScriptSteps_ShouldNotBeAViablePlan()
}

[Test]
public void SingleEnabledScriptStep_ShouldBeAViablePlan()
public void SingleEnabledScriptStep_ShouldBeAvailablePlan()
{
// arrange
var deploymentStepResource = ResourceBuilderHelpers.GetStep();
Expand All @@ -161,7 +161,7 @@ public void SingleEnabledScriptStep_ShouldBeAViablePlan()
}

[Test]
public void SingleEnabledScriptStepScopedToDifferentChannel_ShouldNotBeAViablePlan()
public void SingleEnabledScriptStepScopedToDifferentChannel_ShouldNotBeAvailablePlan()
{
// arrange
var deploymentStepResource = ResourceBuilderHelpers.GetStep();
Expand Down
2 changes: 1 addition & 1 deletion source/Octo.Tests/Util/UriExtensionsFixture.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void ShouldAppendSuffixIfThereIsNoOverlap()
}

[Test]
public void ShouldRemoveAnyOverlapBetweenBaseAddresAndSuffix()
public void ShouldRemoveAnyOverlapBetweenBaseAddressAndSuffix()
{
var result = new Uri("http://www.mysite.com/virtual").EnsureEndsWith("/virtual/suffix");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public async Task Request()
Name = channelName,
IsDefault = makeDefaultChannel ?? false,
Description = channelDescription ?? string.Empty,
LifecycleId = lifecycle?.Id, // Allow for the default lifeycle by propagating null
LifecycleId = lifecycle?.Id, // Allow for the default lifecycle by propagating null
Rules = new List<ChannelVersionRuleResource>()
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected override async Task ValidateParameters()
* A create release operation can also optionally deploy the release, however any invalid options that
* are specific only to the deployment will fail after the release has been created. This can leave
* a deployment in a half finished state, so this validation ensures that the input relating to the
* deployment is valid so missing or incorrect input doesn't stop stop the deployment after a release is
* deployment is valid so missing or incorrect input doesn't stop the deployment after a release is
* created.
*
* Note that certain validations still need to be done on the server. Permissions and lifecycle progression
Expand Down Expand Up @@ -315,8 +315,8 @@ async Task<List<TenantResource>> GetTenants(ProjectResource project,
.Select(tp => tp.Id)
.ToArray();

var tentats = await Repository.Tenants.Get(tenantPromotions).ConfigureAwait(false);
deployableTenants.AddRange(tentats);
var tenants = await Repository.Tenants.Get(tenantPromotions).ConfigureAwait(false);
deployableTenants.AddRange(tenants);

commandOutputProvider.Information("Found {NumberOfTenants} Tenants who can deploy {Project:l} {Version:l} to {Environment:l}",
deployableTenants.Count,
Expand Down
4 changes: 2 additions & 2 deletions source/Octopus.Cli/Commands/HealthStatusProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
namespace Octopus.Cli.Commands
{
/// <summary>
/// This class exists to provide backwards compataility to the pre 3.4.0 changes to machine state.
/// As of 3.4.0 the <see cref="MachineModelStatus" /> enum has been marked as obselete to be replaced with <see cref="MachineModelHealthStatus" />
/// This class exists to provide backwards compatibility to the pre 3.4.0 changes to machine state.
/// As of 3.4.0 the <see cref="MachineModelStatus" /> enum has been marked as obsolete to be replaced with <see cref="MachineModelHealthStatus" />
/// </summary>
public class HealthStatusProvider
{
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Cli/Commands/Releases/ReleasePlan.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public ReleasePlan(ProjectResource project,
a.Channels
})
.Where(x => string.IsNullOrEmpty(x.PackageId) && x.IsDisabled == false) // only consider enabled script steps
.Where(a => !a.Channels.Any() || a.Channels.Contains(channel.Id)) // only include actions without channel scope or with a matchign channel scope
.Where(a => !a.Channels.Any() || a.Channels.Contains(channel.Id)) // only include actions without channel scope or with a matching channel scope
.Select(x =>
new ReleasePlanItem(x.StepName,
null,
Expand Down