From d0203f9e5cbeaa565637d8b681e85ac9ff8aa5d8 Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Mon, 3 May 2021 14:25:43 +0200
Subject: [PATCH] fix: Revert "feat(ci): Use data files from arbitrary path"
(#9833)
This reverts commit eb4f8451e0a53755d26b88e251c851e0412e924d.
---
lib/manager/pip_setup/util.ts | 2 +-
lib/versioning/node/schedule.ts | 2 +-
tools/generate-imports.ts | 38 ++++++---------------------------
3 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/lib/manager/pip_setup/util.ts b/lib/manager/pip_setup/util.ts
index 84b020c0df..dae67ed378 100644
--- a/lib/manager/pip_setup/util.ts
+++ b/lib/manager/pip_setup/util.ts
@@ -16,7 +16,7 @@ export async function getExtractFile(): Promise<string> {
const cacheDir = await ensureCacheDir('./others/pip_setup');
extractPy = join(cacheDir, EXTRACT);
- await outputFile(extractPy, dataFiles.get('data/extract.py'));
+ await outputFile(extractPy, dataFiles.get('extract.py'));
return extractPy;
}
diff --git a/lib/versioning/node/schedule.ts b/lib/versioning/node/schedule.ts
index 094c235d12..dfd5df3096 100644
--- a/lib/versioning/node/schedule.ts
+++ b/lib/versioning/node/schedule.ts
@@ -11,7 +11,7 @@ interface NodeJsSchedule {
export type NodeJsData = Record<string, NodeJsSchedule>;
export const nodeSchedule: NodeJsData = JSON.parse(
- dataFiles.get('data/node-js-schedule.json')
+ dataFiles.get('node-js-schedule.json')
);
export interface NodeJsPolicies {
diff --git a/tools/generate-imports.ts b/tools/generate-imports.ts
index b4a19adc37..90c2b2009b 100644
--- a/tools/generate-imports.ts
+++ b/tools/generate-imports.ts
@@ -1,4 +1,3 @@
-import path from 'path';
import fs from 'fs-extra';
import shell from 'shelljs';
@@ -23,35 +22,12 @@ async function updateFile(file: string, code: string): Promise<void> {
newFiles.add(file);
}
-const dataPaths = ['data'];
-
-function expandPaths(paths: string[]): string[] {
- return paths
- .map((pathName) => {
- const stat = fs.statSync(pathName);
-
- if (stat.isFile()) {
- return [pathName];
- }
-
- if (stat.isDirectory()) {
- const dirPaths = fs
- .readdirSync(pathName, { withFileTypes: true })
- .filter(
- (dirent) =>
- !(dirent.isFile() && ['.DS_Store'].includes(dirent.name))
- )
- .map((dirent) => path.join(pathName, dirent.name));
- return expandPaths(dirPaths);
- }
-
- return [];
- })
- .reduce((x, y) => x.concat(y));
-}
-
async function generateData(): Promise<void> {
- const files = expandPaths(dataPaths).sort();
+ const files = fs
+ .readdirSync('data', { withFileTypes: true })
+ .filter((dirent) => dirent.isFile())
+ .map((dirent) => dirent.name)
+ .sort();
const importDataFileType = files.map((x) => ` | '${x}'`).join('\n');
@@ -59,8 +35,8 @@ async function generateData(): Promise<void> {
const contentMapAssignments: string[] = [];
for (const file of files) {
- shell.echo(`> ${file}`);
- const rawFileContent = await fs.readFile(file, 'utf8');
+ shell.echo(`> data/${file}`);
+ const rawFileContent = await fs.readFile(`data/${file}`, 'utf8');
contentMapAssignments.push(
`data.set('${file}', ${JSON.stringify(rawFileContent)});`
);
--
GitLab