Skip to content

Commit

Permalink
Fix script paths
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelsauter committed Sep 22, 2023
1 parent 05a77c1 commit 781f28b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/docs/build.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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}`.
Expand Down
2 changes: 1 addition & 1 deletion build/images/Dockerfile.node18-npm-toolset
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/tasks/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -54,7 +54,7 @@ spec:
name: build-reused-from-location
steps:
- name: build-npm
# Image is built from build/package/Dockerfile.node<xx>-npm-toolset.
# Image is built from build/images/Dockerfile.node<xx>-npm-toolset.
image: '{{.ImageRepository}}/node$(params.node-version)-npm-toolset:{{.Version}}'
env:
- name: HOME
Expand Down

0 comments on commit 781f28b

Please sign in to comment.