diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index e96f8ed1..4fe0e09e 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -183,8 +183,8 @@ jobs: touch cabal.project echo "packages: $GITHUB_WORKSPACE/source/code/hsec-core" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/code/hsec-tools" >> cabal.project - echo "packages: $GITHUB_WORKSPACE/source/code/cvss" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/code/cwe" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/code/cvss" >> cabal.project echo "packages: $GITHUB_WORKSPACE/source/code/osv" >> cabal.project cat cabal.project - name: sdist @@ -199,34 +199,35 @@ jobs: run: | PKGDIR_hsec_tools="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hsec-tools-[0-9.]*')" echo "PKGDIR_hsec_tools=${PKGDIR_hsec_tools}" >> "$GITHUB_ENV" - PKGDIR_hsec_tools="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hsec-tools-[0-9.]*')" - echo "PKGDIR_hsec_tools=${PKGDIR_hsec_tools}" >> "$GITHUB_ENV" + PKGDIR_cwe="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cwe-[0-9.]*')" + echo "PKGDIR_cwe=${PKGDIR_cwe}" >> "$GITHUB_ENV" + PKGDIR_cvss="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cvss-[0-9.]*')" + echo "PKGDIR_cvss=${PKGDIR_cvss}" >> "$GITHUB_ENV" PKGDIR_hsec_core="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hsec-core-[0-9.]*')" echo "PKGDIR_hsec_core=${PKGDIR_hsec_core}" >> "$GITHUB_ENV" PKGDIR_osv="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/osv-[0-9.]*')" echo "PKGDIR_osv=${PKGDIR_osv}" >> "$GITHUB_ENV" - PKGDIR_cvss="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cvss-[0-9.]*')" - echo "PKGDIR_cvss=${PKGDIR_cvss}" >> "$GITHUB_ENV" rm -f cabal.project cabal.project.local touch cabal.project touch cabal.project.local - echo "packages: ${PKGDIR_hsec_core}" >> cabal.project echo "packages: ${PKGDIR_hsec_tools}" >> cabal.project - echo "packages: ${PKGDIR_osv}" >> cabal.project + echo "packages: ${PKGDIR_cwe}" >> cabal.project echo "packages: ${PKGDIR_cvss}" >> cabal.project + echo "packages: ${PKGDIR_hsec_core}" >> cabal.project + echo "packages: ${PKGDIR_osv}" >> cabal.project echo "package hsec-tools" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project - echo "package hsec-tools" >> cabal.project + echo "package cwe" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package cvss" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project echo "package hsec-core" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project echo "package osv" >> cabal.project echo " ghc-options: -Werror=missing-methods" >> cabal.project - echo "package cvss" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(cvss|cwe|hsec-core|hsec-tools|osv)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan @@ -265,6 +266,8 @@ jobs: ${CABAL} -vnormal check cd ${PKGDIR_hsec_tools} || false ${CABAL} -vnormal check + cd ${PKGDIR_cwe} || false + ${CABAL} -vnormal check cd ${PKGDIR_cvss} || false ${CABAL} -vnormal check cd ${PKGDIR_osv} || false diff --git a/code/cvss/cvss.cabal b/code/cvss/cvss.cabal index f9d1fbb1..3f4d42f8 100644 --- a/code/cvss/cvss.cabal +++ b/code/cvss/cvss.cabal @@ -10,7 +10,9 @@ author: Tristan de Cacqueray maintainer: tdecacqu@redhat.com category: Data extra-doc-files: CHANGELOG.md -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 + +tested-with: + GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 library exposed-modules: Security.CVSS diff --git a/code/cwe/cwe.cabal b/code/cwe/cwe.cabal index ff0ce476..a1a6a3f1 100644 --- a/code/cwe/cwe.cabal +++ b/code/cwe/cwe.cabal @@ -8,7 +8,9 @@ author: Tristan de Cacqueray maintainer: tdecacqu@redhat.com category: Data extra-doc-files: CHANGELOG.md -tested-with: GHC ==8.10.7 || ==9.0.2 || ==9.2.7 || ==9.4.5 || ==9.6.2 + +tested-with: + GHC ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.8 || ==9.6.3 || ==9.8.1 library exposed-modules: Security.CWE