From 781f28bc70742ec0dfd50292bec9d2191c9dd404 Mon Sep 17 00:00:00 2001 From: Michael Sauter Date: Fri, 22 Sep 2023 10:23:00 +0200 Subject: [PATCH] Fix script paths --- build/docs/build.adoc | 2 +- build/images/Dockerfile.node18-npm-toolset | 2 +- build/tasks/build.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docs/build.adoc b/build/docs/build.adoc index d345061..f223e47 100644 --- a/build/docs/build.adoc +++ b/build/docs/build.adoc @@ -14,7 +14,7 @@ be done by running `eslint --init` or by following the link:https://eslint.org/docs/user-guide/getting-started[official documentation]. The exact build recipe can be found at -link:https://github.com/opendevstack/ods-pipeline/blob/master/build/package/scripts/build-npm.sh[build/package/scripts/build-npm.sh]. +link:https://github.com/opendevstack/ods-pipeline-npm/blob/main/build/images/scripts/build.sh[build/images/scripts/build.sh]. In particular, `npm run build` is expected to place outputs into `dist` and `npm run test` is expected to create `build/test-results/test/report.xml` and `build/coverage/{clover.xml,coverage-final.json,lcov.info}`. diff --git a/build/images/Dockerfile.node18-npm-toolset b/build/images/Dockerfile.node18-npm-toolset index 6f59f81..8d27d0b 100644 --- a/build/images/Dockerfile.node18-npm-toolset +++ b/build/images/Dockerfile.node18-npm-toolset @@ -19,7 +19,7 @@ RUN mkdir -p /.npm $HOME/.npm-global/lib && \ chmod -R g=u /app /.npm $HOME # Add scripts -COPY build/package/scripts/build.sh /usr/local/bin/build-npm +COPY build/images/scripts/build.sh /usr/local/bin/build-npm ADD https://raw.githubusercontent.com/opendevstack/ods-pipeline/master/build/package/scripts/cache-build.sh /usr/local/bin/cache-build ADD https://raw.githubusercontent.com/opendevstack/ods-pipeline/master/build/package/scripts/copy-build-if-cached.sh /usr/local/bin/copy-build-if-cached ADD https://raw.githubusercontent.com/opendevstack/ods-pipeline/master/build/package/scripts/copy-artifacts.sh /usr/local/bin/copy-artifacts diff --git a/build/tasks/build.yaml b/build/tasks/build.yaml index 7dd8d05..16e39a5 100644 --- a/build/tasks/build.yaml +++ b/build/tasks/build.yaml @@ -39,7 +39,7 @@ spec: - name: build-script description: >- Build script to execute. The - link:https://github.com/opendevstack/ods-pipeline/blob/master/build/package/scripts/build-npm.sh[default script] + link:https://github.com/opendevstack/ods-pipeline-npm/blob/main/build/images/scripts/build.sh[default script] is located in the container image. If you specify a relative path instead, it will be resolved from the workspace. See the task definition for details how the build script is invoked. @@ -54,7 +54,7 @@ spec: name: build-reused-from-location steps: - name: build-npm - # Image is built from build/package/Dockerfile.node-npm-toolset. + # Image is built from build/images/Dockerfile.node-npm-toolset. image: '{{.ImageRepository}}/node$(params.node-version)-npm-toolset:{{.Version}}' env: - name: HOME