mirror of
https://github.com/xuthus83/pigallery2.git
synced 2024-11-03 21:04:03 +08:00
adding switch to force optDeps for docker
This commit is contained in:
parent
fb99df6157
commit
5c6919bf27
2
.github/workflows/blank.yml
vendored
2
.github/workflows/blank.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
||||
run: npm install --unsafe-perm
|
||||
-
|
||||
name: Create Release
|
||||
run: npm run create-release -- --skip-opt-packages=ffmpeg,ffprobe
|
||||
run: npm run create-release -- --skip-opt-packages=ffmpeg,ffprobe --force-opt-packages
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
name: pigallery2-release
|
||||
|
16
gulpfile.ts
16
gulpfile.ts
@ -12,14 +12,17 @@ const translationFolder = 'translate';
|
||||
const tsBackendProject = ts.createProject('tsconfig.json');
|
||||
declare var process: NodeJS.Process;
|
||||
|
||||
const getSwitch = (name: string, def: string = null) => {
|
||||
const getSwitch = (name: string, def: string = null): string => {
|
||||
name = '--' + name;
|
||||
for (let i = 0; i < process.argv.length; i++) {
|
||||
if (process.argv[i].startsWith(name + '=')) {
|
||||
return process.argv[i].replace(name + '=', '').trim();
|
||||
}
|
||||
if (process.argv[i].startsWith(name) && i + 1 < process.argv.length) {
|
||||
return process.argv[i + 1].trim();
|
||||
if (process.argv[i].startsWith(name)) {
|
||||
if (i + 1 < process.argv.length) {
|
||||
return process.argv[i + 1].trim();
|
||||
}
|
||||
return 'true';
|
||||
}
|
||||
}
|
||||
return def;
|
||||
@ -129,6 +132,13 @@ gulp.task('copy-package', function () {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!!getSwitch('force-opt-packages')) {
|
||||
for (const key of Object.keys(json.optionalDependencies)) {
|
||||
json.dependencies[key] = json.optionalDependencies[key];
|
||||
}
|
||||
delete json.optionalDependencies;
|
||||
}
|
||||
return json;
|
||||
}))
|
||||
.pipe(gulp.dest('./release'));
|
||||
|
@ -81,22 +81,30 @@ export class ConfigDiagnostics {
|
||||
}
|
||||
}
|
||||
|
||||
static async testSharp() {
|
||||
const sharp = require('sharp');
|
||||
sharp();
|
||||
}
|
||||
|
||||
static async testGM() {
|
||||
const gm = require('gm');
|
||||
await new Promise((resolve, reject) => {
|
||||
gm(ProjectPath.FrontendFolder + '/assets/icon.png').size((err: Error) => {
|
||||
if (err) {
|
||||
return reject(err.toString());
|
||||
}
|
||||
return resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
static async testThumbnailLib(processingLibrary: ServerConfig.PhotoProcessingLib) {
|
||||
switch (processingLibrary) {
|
||||
case ServerConfig.PhotoProcessingLib.sharp:
|
||||
const sharp = require('sharp');
|
||||
sharp();
|
||||
await this.testSharp();
|
||||
break;
|
||||
case ServerConfig.PhotoProcessingLib.gm:
|
||||
const gm = require('gm');
|
||||
await new Promise((resolve, reject) => {
|
||||
gm(ProjectPath.FrontendFolder + '/assets/icon.png').size((err: Error) => {
|
||||
if (err) {
|
||||
return reject(err.toString());
|
||||
}
|
||||
return resolve();
|
||||
});
|
||||
});
|
||||
await this.testGM();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -120,7 +128,6 @@ export class ConfigDiagnostics {
|
||||
}
|
||||
|
||||
|
||||
|
||||
static async testServerPhotoConfig(server: ServerConfig.PhotoConfig) {
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user