From b7030ee6fa99e2cd3c5a2cbbe7db124f437fe727 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Mon, 23 Oct 2023 11:56:11 +0100 Subject: [PATCH 1/3] Workflow Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 7e84cc6..046af0b 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -76,8 +76,7 @@ jobs: npm install -g @cyclonedx/cdxgen --omit=optional cdxgen -t java --deep -o $GITHUB_WORKSPACE/repotests/java-sec-code/bom.json $GITHUB_WORKSPACE/repotests/java-sec-code ./atom.sh reachables -o /tmp/java-sec-code.atom -l java $GITHUB_WORKSPACE/repotests/java-sec-code -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/java-sec-code.reachables.json + - run: | cdxgen -t js -o $GITHUB_WORKSPACE/repotests/juice-shop/bom.json $GITHUB_WORKSPACE/repotests/juice-shop ./atom.sh reachables -o /tmp/juice-shop.atom -l js $GITHUB_WORKSPACE/repotests/juice-shop -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/juice-shop.reachables.json shell: bash - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 6dc5466904292675747400f0684dc9ded335c1c7 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Mon, 23 Oct 2023 12:06:35 +0100 Subject: [PATCH 2/3] Workflow Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 046af0b..98df259 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -72,11 +72,16 @@ jobs: ./atom.sh usages -o /tmp/c3.atom -l c $GITHUB_WORKSPACE/repotests/libexpat -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/c.usages.json env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" - run: | npm install -g @cyclonedx/cdxgen --omit=optional cdxgen -t java --deep -o $GITHUB_WORKSPACE/repotests/java-sec-code/bom.json $GITHUB_WORKSPACE/repotests/java-sec-code ./atom.sh reachables -o /tmp/java-sec-code.atom -l java $GITHUB_WORKSPACE/repotests/java-sec-code -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/java-sec-code.reachables.json + env: + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" - run: | cdxgen -t js -o $GITHUB_WORKSPACE/repotests/juice-shop/bom.json $GITHUB_WORKSPACE/repotests/juice-shop ./atom.sh reachables -o /tmp/juice-shop.atom -l js $GITHUB_WORKSPACE/repotests/juice-shop -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/juice-shop.reachables.json shell: bash + env: + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" From f7ba0b33e5036cfff553e9bddef7fc4414419df7 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Mon, 23 Oct 2023 12:41:36 +0100 Subject: [PATCH 3/3] Workflow Signed-off-by: Prabhu Subramanian --- .github/workflows/repotests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml index 98df259..7b15afd 100644 --- a/.github/workflows/repotests.yml +++ b/.github/workflows/repotests.yml @@ -82,6 +82,6 @@ jobs: - run: | cdxgen -t js -o $GITHUB_WORKSPACE/repotests/juice-shop/bom.json $GITHUB_WORKSPACE/repotests/juice-shop ./atom.sh reachables -o /tmp/juice-shop.atom -l js $GITHUB_WORKSPACE/repotests/juice-shop -Dlog4j.configurationFile=log4j2.xml --slice-outfile /tmp/juice-shop.reachables.json - shell: bash env: JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + if: runner.os != 'Windows'