Skip to content

Commit

Permalink
Add missing forward slash when pulling from the .azuredevops folder i…
Browse files Browse the repository at this point in the history
…n the extension (#924)
  • Loading branch information
mburumaxwell authored Jan 5, 2024
1 parent 6fc5063 commit 0548ddb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In this repository you'll find:
## Using a configuration file

Similar to the GitHub native version where you add a `.github/dependabot.yml` file, this repository adds support for the same official [configuration options](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file) via a file located at `.github/dependabot.yml`. This support is only available in the Azure DevOps extension and the [managed version](https://managd.dev). However, the extension does not currently support automatically picking up the file, a pipeline is still required. See [docs](./extension/README.md#usage).
Similar to the GitHub native version where you add a `.azuredevops/dependabot.yml` or `.github/dependabot.yml` file, this repository adds support for the same official [configuration options](https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file) via a file located at `.azuredevops/dependabot.yml` or `.github/dependabot.yml`. This support is only available in the Azure DevOps extension and the [managed version](https://managd.dev). However, the extension does not currently support automatically picking up the file, a pipeline is still required. See [docs](./extension/README.md#usage).

We are well aware that ignore conditions are not explicitly passed and passed on from the extension/server to the container. It is intentional. The ruby script in the docker container does it automatically. If you are having issues, search for related issues such as https://github.com/tinglesoftware/dependabot-azure-devops/pull/582 before creating a new issue. You can also test against various reproductions such as https://dev.azure.com/tingle/dependabot/_git/repro-582

Expand Down
2 changes: 1 addition & 1 deletion extension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This is the unofficial [dependabot](https://github.com/Dependabot/dependabot-cor

## Usage

Add a configuration file stored at `.github/dependabot.yml` or `.github/dependabot.yaml` conforming to the [official spec](https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates).
Add a configuration file stored at `.azuredevops/dependabot.yml` or `.github/dependabot.yml` conforming to the [official spec](https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates).

To use in a YAML pipeline:

Expand Down
2 changes: 1 addition & 1 deletion extension/task/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ async function run() {
throw new Error(
`
Using explicit inputs is no longer supported.
Migrate to using a config file at .github/dependabot.yml.
Migrate to using a config file at .azuredevops/dependabot.yml or .github/dependabot.yml.
See https://github.com/tinglesoftware/dependabot-azure-devops/tree/main/extension#usage for more information.
`
);
Expand Down
2 changes: 1 addition & 1 deletion extension/task/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"label": "Use Dependabot YAML file",
"defaultValue": "true",
"required": false,
"helpMarkDown": "Determines if the task will pick config values specified from the yaml file located at `.github/dependabot.yml` or `.github/dependabot.yaml`"
"helpMarkDown": "Determines if the task will pick config values specified from the yaml file located at `.azuredevops/dependabot.yml` or `.github/dependabot.yml`"
},

{
Expand Down
6 changes: 3 additions & 3 deletions extension/task/utils/parseConfigFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import axios from "axios";
/**
* Parse the dependabot config YAML file to specify update configuration
*
* The file should be located at '/.github/dependabot.yml' or '/.github/dependabot.yaml'
* The file should be located at '/.azuredevops/dependabot.yml' or '/.github/dependabot.yml'
*
* To view YAML file format, visit
* https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates#allow
Expand All @@ -25,8 +25,8 @@ import axios from "axios";
*/
async function parseConfigFile(variables: ISharedVariables): Promise<IDependabotConfig> {
const possibleFilePaths = [
".azuredevops/dependabot.yml",
".azuredevops/dependabot.yaml",
"/.azuredevops/dependabot.yml",
"/.azuredevops/dependabot.yaml",

"/.github/dependabot.yaml",
"/.github/dependabot.yml",
Expand Down

0 comments on commit 0548ddb

Please sign in to comment.