Skip to content
Merged
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
8 changes: 8 additions & 0 deletions .changeset/modern-cups-drop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@paklo/runner": minor
---

Remove `fetch_files` command.
In <https://github.com/dependabot/dependabot-core/pull/13275> the `fetch_files` command was made a no-op, and it does not need to be called.
Also cleaned up environment variables that are not used as a result.
Copied from: <https://github.com/github/dependabot-action/pull/1550>
5 changes: 0 additions & 5 deletions apps/web/src/workflows/jobs/trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import {
extractUpdaterSha,
JOB_INPUT_FILENAME,
JOB_INPUT_PATH,
JOB_OUTPUT_FILENAME,
JOB_OUTPUT_PATH,
PROXY_IMAGE_NAME,
ProxyBuilder,
REPO_CONTENTS_PATH,
Expand Down Expand Up @@ -478,8 +476,6 @@ export async function createAndStartJobResources({
{ name: 'DEPENDABOT_JOB_TOKEN', value: '' },
{ name: 'DEPENDABOT_JOB_PATH', value: `${JOB_INPUT_PATH}/${JOB_INPUT_FILENAME}` },
{ name: 'DEPENDABOT_OPEN_TIMEOUT_IN_SECONDS', value: '15' },
// not using the file share because we are not consuming the output yet
{ name: 'DEPENDABOT_OUTPUT_PATH', value: `${JOB_OUTPUT_PATH}/${JOB_OUTPUT_FILENAME}` },
// not using the file share because we do not need to clone repos there
{ name: 'DEPENDABOT_REPO_CONTENTS_PATH', value: REPO_CONTENTS_PATH },
{ name: 'DEPENDABOT_API_URL', value: apiUrl },
Expand All @@ -488,7 +484,6 @@ export async function createAndStartJobResources({
{ name: 'HTTP_PROXY', value: proxyUrl },
{ name: 'https_proxy', value: proxyUrl },
{ name: 'HTTPS_PROXY', value: proxyUrl },
{ name: 'UPDATER_ONE_CONTAINER', value: '1' },

// enable or disable connectivity check based on feature flag
...((await enableDependabotConnectivityCheck())
Expand Down
2 changes: 1 addition & 1 deletion packages/runner/src/container-service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const ContainerService = {
// Then run the dependabot commands as dependabot user
const dependabotCommands = [
'mkdir -p /home/dependabot/dependabot-updater/output',
'$DEPENDABOT_HOME/dependabot-updater/bin/run fetch_files',
// 'fetch_files' command removed as it is now a no-op
];

if (command === 'graph') {
Expand Down
4 changes: 0 additions & 4 deletions packages/runner/src/updater-builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import type { JobParameters } from './params';
import type { Proxy } from './proxy';
import { extractUpdaterSha } from './utils';

export const JOB_OUTPUT_FILENAME = 'output.json';
export const JOB_OUTPUT_PATH = '/home/dependabot/dependabot-updater/output';
export const JOB_INPUT_FILENAME = 'job.json';
export const JOB_INPUT_PATH = `/home/dependabot/dependabot-updater`;
export const REPO_CONTENTS_PATH = '/home/dependabot/dependabot-updater/repo';
Expand Down Expand Up @@ -40,15 +38,13 @@ export class UpdaterBuilder {
`DEPENDABOT_JOB_TOKEN=`,
`DEPENDABOT_JOB_PATH=${JOB_INPUT_PATH}/${JOB_INPUT_FILENAME}`,
`DEPENDABOT_OPEN_TIMEOUT_IN_SECONDS=15`,
`DEPENDABOT_OUTPUT_PATH=${JOB_OUTPUT_PATH}/${JOB_OUTPUT_FILENAME}`,
`DEPENDABOT_REPO_CONTENTS_PATH=${REPO_CONTENTS_PATH}`,
`DEPENDABOT_API_URL=${this.jobParams.dependabotApiDockerUrl}`,
`SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt`,
`http_proxy=${proxyUrl}`,
`HTTP_PROXY=${proxyUrl}`,
`https_proxy=${proxyUrl}`,
`HTTPS_PROXY=${proxyUrl}`,
`UPDATER_ONE_CONTAINER=1`,
`ENABLE_CONNECTIVITY_CHECK=${process.env.DEPENDABOT_ENABLE_CONNECTIVITY_CHECK || '1'}`,

// for updates relying on .NET (e.g. NuGet) and running on macOS (e.g. dev laptop or local MacMini),
Expand Down