Fixes #262 normalize artifact paths
This commit is contained in:
13
lib/PathNormalizer.js
Normal file
13
lib/PathNormalizer.js
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
"use strict";
|
||||||
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||||
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||||
|
};
|
||||||
|
Object.defineProperty(exports, "__esModule", { value: true });
|
||||||
|
exports.PathNormalizer = void 0;
|
||||||
|
const path_1 = __importDefault(require("path"));
|
||||||
|
class PathNormalizer {
|
||||||
|
static normalizePath(pathString) {
|
||||||
|
return path_1.default.resolve(pathString).split(path_1.default.sep).join("/");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exports.PathNormalizer = PathNormalizer;
|
||||||
@@ -3,6 +3,7 @@ import {Globber, FileGlobber} from "./Globber";
|
|||||||
import {Artifact} from "./Artifact";
|
import {Artifact} from "./Artifact";
|
||||||
import untildify from "untildify";
|
import untildify from "untildify";
|
||||||
import {ArtifactPathValidator} from "./ArtifactPathValidator";
|
import {ArtifactPathValidator} from "./ArtifactPathValidator";
|
||||||
|
import {PathNormalizer} from "./PathNormalizer";
|
||||||
|
|
||||||
export interface ArtifactGlobber {
|
export interface ArtifactGlobber {
|
||||||
globArtifactString(artifact: string, contentType: string, errorsFailBuild: boolean): Artifact[]
|
globArtifactString(artifact: string, contentType: string, errorsFailBuild: boolean): Artifact[]
|
||||||
@@ -19,6 +20,7 @@ export class FileArtifactGlobber implements ArtifactGlobber {
|
|||||||
const split = /[,\n]/
|
const split = /[,\n]/
|
||||||
return artifact.split(split)
|
return artifact.split(split)
|
||||||
.map(path => path.trimStart())
|
.map(path => path.trimStart())
|
||||||
|
.map(path => PathNormalizer.normalizePath(path))
|
||||||
.map(path => FileArtifactGlobber.expandPath(path))
|
.map(path => FileArtifactGlobber.expandPath(path))
|
||||||
.map(pattern => this.globPattern(pattern, errorsFailBuild))
|
.map(pattern => this.globPattern(pattern, errorsFailBuild))
|
||||||
.map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0]))
|
.map((globResult) => FileArtifactGlobber.validatePattern(errorsFailBuild, globResult[1], globResult[0]))
|
||||||
|
|||||||
7
src/PathNormalizer.ts
Normal file
7
src/PathNormalizer.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import path from "path";
|
||||||
|
|
||||||
|
export class PathNormalizer {
|
||||||
|
static normalizePath(pathString: string): string {
|
||||||
|
return pathString.split(path.sep).join("/")
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user