Compare commits

..

2 Commits

Author SHA1 Message Date
6d1edebaaa
попытка настроить время материала
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-07 10:25:07 +03:00
78e27044f4
Упрощение сборки 2024-09-07 10:14:21 +03:00
2 changed files with 10 additions and 6 deletions

View File

@ -39,8 +39,10 @@ steps:
- sleep 15 - sleep 15
- echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin - echo "$DOCKER_REGISTRY_TOKEN" | docker login docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
- echo "$DOCKER_REGISTRY_TOKEN" | docker login hub.docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin - echo "$DOCKER_REGISTRY_TOKEN" | docker login hub.docker.struchkov.dev --username $DOCKER_REGISTRY_USER --password-stdin
- docker buildx create --use - docker build -t "docker.struchkov.dev/quartz:develop" .
- docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "docker.struchkov.dev/quartz:develop" . - docker push docker.struchkov.dev/quartz:develop
# - docker buildx create --use
# - docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t "docker.struchkov.dev/quartz:develop" .
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
@ -93,6 +95,6 @@ steps:
# drone sign --save DockerFiles/quartz # drone sign --save DockerFiles/quartz
--- ---
kind: signature kind: signature
hmac: cf0faf7e69ed98a6c0191b3578f874c41d6a297645bcf5c8cc1994c540f207ba hmac: 27395716fe77ffcb190d0c6cbbc867ede272b3a79ee25dc23672f24459054b22
... ...

View File

@ -41,7 +41,8 @@ export const CreatedModifiedDate: QuartzTransformerPlugin<Partial<Options>> = (u
let published: MaybeDate = undefined let published: MaybeDate = undefined
const fp = file.data.filePath! const fp = file.data.filePath!
const fullFp = path.isAbsolute(fp) ? fp : path.posix.join(file.cwd, fp) const repoRoot = path.resolve(file.cwd, "content"); // Указываем путь к корневой папке репозитория
const fullFp = path.isAbsolute(fp) ? fp : path.join(repoRoot, fp); // Создаем абсолютный путь
for (const source of opts.priority) { for (const source of opts.priority) {
if (source === "filesystem") { if (source === "filesystem") {
const st = await fs.promises.stat(fullFp) const st = await fs.promises.stat(fullFp)
@ -58,12 +59,13 @@ export const CreatedModifiedDate: QuartzTransformerPlugin<Partial<Options>> = (u
// Get a reference to the main git repo. // Get a reference to the main git repo.
// It's either the same as the workdir, // It's either the same as the workdir,
// or 1+ level higher in case of a submodule/subtree setup // or 1+ level higher in case of a submodule/subtree setup
repo = Repository.discover("/usr/src/app/content") repo = Repository.discover(repoRoot)
console.log(chalk.green(`Git repository found at: ${repo.path()}`)); console.log(chalk.green(`Git repository found at: ${repo.path()}`));
} }
try { try {
modified ||= await repo.getFileLatestModifiedDateAsync(file.data.filePath!) const relativePathToRepo = path.relative(repoRoot, fullFp);
modified ||= await repo.getFileLatestModifiedDateAsync(relativePathToRepo)
} catch { } catch {
console.log( console.log(
chalk.yellow( chalk.yellow(