From d8533a76ee5f6a5dfe1818b56f584f947f2432d5 Mon Sep 17 00:00:00 2001 From: Bruno Pacheco Date: Wed, 13 Dec 2023 15:13:28 +0100 Subject: [PATCH] Fix report issues --- .github/workflows/aggregated_report.yml | 2 +- .github/workflows/report_per_repo.yml | 2 +- .gitmodules | 6 +++--- repos/rems | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) delete mode 160000 repos/rems diff --git a/.github/workflows/aggregated_report.yml b/.github/workflows/aggregated_report.yml index e5ab8b4..d941237 100644 --- a/.github/workflows/aggregated_report.yml +++ b/.github/workflows/aggregated_report.yml @@ -17,5 +17,5 @@ jobs: submodules: 'true' - uses: oss-review-toolkit/ort-ci-github-action@b6d71a83acba8619f16b30c008f212a7a572f8e8 #v1 with: - report-formats: CycloneDx,SpdxDocument,WebApp,PlainTextTemplate,Opossum + report-formats: CycloneDx,WebApp,PlainTextTemplate,Opossum run: 'cache-dependencies,cache-scan-results,labels,analyzer,evaluator,advisor,reporter,upload-results' diff --git a/.github/workflows/report_per_repo.yml b/.github/workflows/report_per_repo.yml index fb77e47..c6ce191 100644 --- a/.github/workflows/report_per_repo.yml +++ b/.github/workflows/report_per_repo.yml @@ -56,6 +56,6 @@ jobs: repository: ${{ matrix.repository }} - uses: oss-review-toolkit/ort-ci-github-action@b6d71a83acba8619f16b30c008f212a7a572f8e8 #v1 with: - report-formats: CycloneDx,SpdxDocument,WebApp,PlainTextTemplate,Opossum + report-formats: CycloneDx,WebApp,PlainTextTemplate,Opossum sw-name: ${{ matrix.sw-name }} run: 'cache-dependencies,cache-scan-results,labels,analyzer,evaluator,advisor,reporter,upload-results' \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 10de1a8..5efeb50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -35,9 +35,6 @@ [submodule "repos/beacon2-ri-api"] path = repos/beacon2-ri-api url = git@github.com:EGA-archive/beacon2-ri-api.git -[submodule "repos/rems"] - path = repos/rems - url = git@github.com:CSCfi/rems.git [submodule "repos/starter-kit-rems.git"] path = repos/starter-kit-rems.git url = git@github.com:GenomicDataInfrastructure/starter-kit-rems.git @@ -53,3 +50,6 @@ [submodule "repos/starter-kit-lsaai"] path = repos/starter-kit-lsaai url = git@github.com:GenomicDataInfrastructure/starter-kit-lsaai.git +[submodule "repos/cscfi-rems"] + path = repos/cscfi-rems + url = git@github.com:CSCfi/rems.git diff --git a/repos/rems b/repos/rems deleted file mode 160000 index 1faf506..0000000 --- a/repos/rems +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1faf506255c58870bcd09bc3a553bcaeecb7344a