Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use package import method in tests #1367

Merged
merged 3 commits into from
Sep 9, 2024
Merged

use package import method in tests #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf90317
use clone package import method in tests
prabhu Sep 9, 2024
6aec872
use copy package import method in tests
prabhu Sep 9, 2024
38c4f00
use copy package import method in tests
prabhu Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
**/.git
.github/
.vscode/
.deno/
.deno/
test/
docs/
contrib/
8 changes: 4 additions & 4 deletions .github/workflows/dockertests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: npm install, build and test
run: |
corepack enable
corepack pnpm install
corepack pnpm install --package-import-method copy
corepack pnpm test
mkdir -p bomresults repotests
env:
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
- name: npm install, build and test
run: |
corepack enable
corepack pnpm install
corepack pnpm install --package-import-method copy
corepack pnpm test
mkdir -p bomresults repotests
env:
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
- name: npm install, build and test
run: |
corepack enable
corepack pnpm install
corepack pnpm install --package-import-method copy
mkdir -p bomresults
env:
CI: true
Expand Down Expand Up @@ -191,7 +191,7 @@ jobs:
- name: npm install, build
run: |
corepack enable
corepack pnpm install
corepack pnpm install --package-import-method copy
mkdir bomresults
env:
CI: true
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/repotests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: npm install, build and test
run: |
corepack enable
corepack pnpm install
corepack pnpm install --package-import-method copy
corepack pnpm test
mkdir -p repotests
mkdir -p bomresults
Expand Down Expand Up @@ -531,7 +531,6 @@ jobs:
shell: bash
- name: denotests
run: |
rm -rf node_modules
deno info bin/cdxgen.js
deno info bin/evinse.js
deno run --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net bin/cdxgen.js -p -t java repotests/java-sec-code -o bomresults/bom-java-sec-code-deno.json --deep
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ RUN set -e; \
&& gem install bundler \
&& gem --version \
&& bundler --version \
&& cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method clone \
&& cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy \
&& mkdir -p /opt/cdxgen-node-cache \
&& chown -R cyclonedx:cyclonedx /opt/cdxgen /opt/cdxgen-node-cache \
&& chmod a-w -R /opt \
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-ppc64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ RUN set -e; \
&& gem --version \
&& bundler --version
COPY . /opt/cdxgen
RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method clone \
RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy \
&& chown -R cyclonedx:cyclonedx /opt/cdxgen \
&& chmod a-w -R /opt \
&& rm -rf /root/.cache /var/cache/yum /root/.cargo \
Expand Down
Loading