Skip to content

Commit b7d0f5a

Browse files
committed
feat: improve aws cleanup
1 parent b8358c9 commit b7d0f5a

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/workflows/run-all-unit-tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- run: npm ci
3333
- run: npx tsx scripts/cleanup-github-actions.ts
3434

35-
- name: Setup tmate session
36-
uses: mxschmitt/action-tmate@v3
35+
# - name: Setup tmate session
36+
# uses: mxschmitt/action-tmate@v3
3737

38-
- run: npm run test -- ./test --no-file-parallelism --disable-console-intercept
38+
- run: npm run test -- ./test/aws-cli --no-file-parallelism --silent=passed-only

scripts/cleanup-github-actions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ await testSpawn('rustup self uninstall -y');
1414

1515
await testSpawn('rm -rf /usr/bin/go', { requiresRoot: true })
1616
await testSpawn('rm -rf /usr/bin/python', { requiresRoot: true })
17+
await testSpawn('rm -rf /usr/bin/python3', { requiresRoot: true })
1718
await testSpawn('rm -rf /usr/bin/ruby', { requiresRoot: true })

src/resources/aws-cli/cli/aws-cli.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,17 @@ softwareupdate --install-rosetta
109109
return;
110110
}
111111

112-
await $.spawnSafe(`rm ${installLocation}`, { requiresRoot: true });
113-
await $.spawnSafe(`rm ${installLocation}_completer`, { requiresRoot: true });
114-
await $.spawnSafe('rm -rf $HOME/.aws/');
112+
if (Utils.isLinux()) {
113+
// Remove symlinks from bin dir
114+
await $.spawnSafe('rm -f /usr/local/bin/aws', { requiresRoot: true });
115+
await $.spawnSafe('rm -f /usr/local/bin/aws_completer', { requiresRoot: true });
116+
117+
// Remove the install directory (always /usr/local/aws-cli for the standalone installer)
118+
await $.spawnSafe('rm -rf /usr/local/aws-cli', { requiresRoot: true });
119+
} else {
120+
await $.spawnSafe(`rm ${installLocation}`, { requiresRoot: true });
121+
await $.spawnSafe(`rm ${installLocation}_completer`, { requiresRoot: true });
122+
}
115123
}
116124

117125
private async findInstallLocation(): Promise<null | string> {

0 commit comments

Comments
 (0)