Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
* release/0.2.0:
  (build) Don't fail build if push to Chocolatey fails
  (GH-13) Added projectName to replace in GitHub Files
  Update index.md
  (build) Corrected Title for site
  (build) Corrected WebLinkRoot
  (doc) Updated link to documentation
  Update index.md
  (build) Added missing parenthesis
  Update index.md
  (build) Fixing issue with generating documentation
  Corrected Gitter link
  Update README.md
  (doc) Removed Chocolatey Twitter handle
  (doc) Updated Gitter link
  • Loading branch information
gep13 committed Dec 29, 2018
2 parents 43511f2 + 95a1bf5 commit eff275d
Show file tree
Hide file tree
Showing 8 changed files with 406 additions and 48 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The CI/CD Assets Visual Studio Code provides the following commands:

## Resources

Short YouTube videos of each of the releases of this extension can be found in this [playlist]().
Short YouTube videos of each of the releases of this extension can be found in this [playlist](https://www.youtube.com/playlist?list=PL84yg23i9GBjZXVmLgZfNcc9Nhz4aGdto).

## Installation

Expand All @@ -47,13 +47,13 @@ choco install ci-cd-assets-vscode

## Documentation

You can find the documentation that is available for this project [here](https://gep13.github.io/ci-cd-assets-vscode/).
You can find the documentation that is available for this project [here](https://gep13.github.io/CI-CD-assets-vscode/).

## Contributing

If you would like to see any features added for this VS Code Extension, feel free to raise an [issue](https://github.com/gep13/CI-CD-assets-vscode/issues), and if possible, a follow up pull request.

You can also join in the Gitter Chat [![Join the chat at https://gitter.im/ci-cd-assets/community](https://badges.gitter.im/ci-cd-assets/community.svg)](https://gitter.im/ci-cd-assets/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
You can also join in the Gitter Chat [![Join the chat at https://gitter.im/gep13-oss/community](https://badges.gitter.im/gep13-oss/community.svg)](https://gitter.im/gep13-oss/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

## Releases

Expand Down
5 changes: 4 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ Task("Publish-Chocolatey-Package")
.OnError(exception =>
{
Information("Publish-Chocolatey-Package Task failed, but continuing with next Task...");
publishingError = true;

// TODO: Don't fail build if failure to push package to Chocolatey, as this is known to cause
// some errors at the minute. An error can be returned, but the package is pushed correctly
// publishingError = true;
});

Task("Publish-Extension")
Expand Down
8 changes: 4 additions & 4 deletions build/parameters.cake
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class BuildParameters
{ "Host", WebHost },
{ "LinkRoot", WebLinkRoot },
{ "BaseEditUrl", WebBaseEditUrl },
{ "Title", "Choco VS Code" },
{ "Title", "CI/CD Assets VS Code" },
{ "IncludeGlobalNamespace", false }
};

Expand Down Expand Up @@ -107,7 +107,7 @@ public class BuildParameters
{
get
{
return "Version " + Version.SemVersion + " of the CI/CD Assets VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.ci-cd-assets-vscode. @chocolateynuget @code Full release notes: https://github.com/gep13/CI-CD-assets-vscode/releases/tag/" + Version.SemVersion;
return "Version " + Version.SemVersion + " of the CI/CD Assets VSCode Extension has just been released, https://marketplace.visualstudio.com/items?itemName=gep13.ci-cd-assets-vscode. @code Full release notes: https://github.com/gep13/CI-CD-assets-vscode/releases/tag/" + Version.SemVersion;
}
}

Expand Down Expand Up @@ -193,13 +193,13 @@ public class BuildParameters
),
SkipGitVersion = StringComparer.OrdinalIgnoreCase.Equals("True", context.EnvironmentVariable("CICDASSETSVSCODE_SKIP_GITVERSION")),
ChocolateyPackages = context.MakeAbsolute(context.Directory("BuildArtifacts/_Packages/chocolatey")),
WyamRootDirectoryPath = context.MakeAbsolute(context.Environment.WorkingDirectory),
WyamRootDirectoryPath = context.MakeAbsolute(context.Directory("docs")),
WyamPublishDirectoryPath = context.MakeAbsolute(context.Directory("BuildArtifacts/_PublishedDocumentation")),
WyamConfigurationFile = context.MakeAbsolute((FilePath)"config.wyam"),
WyamRecipe = "Docs",
WyamTheme = "Samson",
WebHost = "gep13.github.io",
WebLinkRoot = "ci-cd-assets-vscode",
WebLinkRoot = "CI-CD-assets-vscode",
WebBaseEditUrl = "https://github.com/gep13/CI-CD-assets-vscode/tree/develop/input/"
};
}
Expand Down
4 changes: 2 additions & 2 deletions docs/input/_Bottom.cshtml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="github-button">
<a href="https://github.com/gep13/CI-CD-assets"><i class="fa fa-github"></i> GitHub</a>
<a href="https://github.com/gep13/CI-CD-assets-vscode"><i class="fa fa-github"></i> GitHub</a>
</div>
<script>
((window.gitter = {}).chat = {}).options = {
room: 'gep13/CI-CD-assets-vscode'
room: 'gep13-oss/community'
};
</script>
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
2 changes: 2 additions & 0 deletions docs/input/index.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# CI/CD Assets Visual Studio Code Extension Documentation

More information coming soon...
Loading

0 comments on commit eff275d

Please sign in to comment.