Skip to content

Commit

Permalink
Skip setting DEPENDABOT_REPO_CONTENTS_PATH until later
Browse files Browse the repository at this point in the history
  • Loading branch information
mburumaxwell committed Sep 14, 2023
1 parent 97a5ac7 commit 67857cb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions server/Tingle.Dependabot/Workflow/UpdateRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public async Task CreateAsync(Repository repository, RepositoryUpdate update, Up
container.Command.Add("/bin/bash");
container.Command.Add("bin/run.sh");
container.Command.Add("update_script");

// add volume mounts
container.VolumeMounts.Add(new ContainerVolumeMount(volumeName, "/mnt/dependabot"));

Expand Down Expand Up @@ -131,7 +131,7 @@ public async Task DeleteAsync(UpdateJob job, CancellationToken cancellationToken

// there is no state for jobs that are running
if (status is UpdateJobStatus.Running) return null;

// delete the job directory f it exists
var jobDirectory = Path.Join(options.WorkingDirectory, job.Id);
if (Directory.Exists(jobDirectory))
Expand Down Expand Up @@ -219,7 +219,8 @@ internal IDictionary<string, string> CreateVariables(Repository repository, Repo
// Add optional values
values.AddIfNotDefault("DEPENDABOT_DEBUG", options.DebugJobs?.ToString().ToLower())
.AddIfNotDefault("DEPENDABOT_API_URL", options.JobsApiUrl)
.AddIfNotDefault("DEPENDABOT_REPO_CONTENTS_PATH", Path.Join(jobDirectory, "repo"))
// Setting DEPENDABOT_REPO_CONTENTS_PATH causes some issues, ignore till we can resolve
//.AddIfNotDefault("DEPENDABOT_REPO_CONTENTS_PATH", Path.Join(jobDirectory, "repo"))
.AddIfNotDefault("UPDATER_DETERMINISTIC", options.DeterministicUpdates?.ToString().ToLower());

values.AddIfNotDefault("GITHUB_ACCESS_TOKEN", options.GithubToken)
Expand Down
4 changes: 2 additions & 2 deletions server/Tingle.Dependabot/Workflow/WorkflowOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ public class WorkflowOptions

/// <summary>Access key for the storage account.</summary>
public string? StorageAccountKey { get; set; } // only used with ContainerInstances

/// <summary>Name of the file share for the working directory</summary>
/// <example>working-dir</example>
public string? FileShareName { get; set; } // only used with ContainerInstances

/// <summary>
/// Possible/allowed paths for the configuration files in a repository.
/// </summary>
Expand Down

0 comments on commit 67857cb

Please sign in to comment.