feat: use semantic package from osv-scalibr

Author: G-Rath

.github/workflows/semantic.yml

@@ -18,6 +18,7 @@ on:
     paths:
       - '.github/workflows/semantic.yml'
       - 'generators/**'
+      - 'go.mod' # for now assume that any changes to this have updated osv-scalibr
 
 # Restrict jobs in this workflow to have no permissions by default; permissions
 # should be granted per job as needed using a dedicated `permissions` block
@@ -52,7 +53,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-debian-versions
-          path: pkg/semantic/testdata/debian-versions-generated.txt
+          path: generators/testdata/debian-versions-generated.txt
 
       - uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
@@ -85,7 +86,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-redhat-versions
-          path: pkg/semantic/testdata/redhat-versions-generated.txt
+          path: generators/testdata/redhat-versions-generated.txt
 
       - uses: actions/cache/save@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
         with:
@@ -109,7 +110,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-packagist-versions
-          path: pkg/semantic/testdata/packagist-versions-generated.txt
+          path: generators/testdata/packagist-versions-generated.txt
 
   generate-pypi-versions:
     permissions:
@@ -129,7 +130,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-pypi-versions
-          path: pkg/semantic/testdata/pypi-versions-generated.txt
+          path: generators/testdata/pypi-versions-generated.txt
 
   generate-rubygems-versions:
     permissions:
@@ -149,7 +150,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-rubygems-versions
-          path: pkg/semantic/testdata/rubygems-versions-generated.txt
+          path: generators/testdata/rubygems-versions-generated.txt
 
   generate-maven-versions:
     permissions:
@@ -175,7 +176,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-maven-versions
-          path: pkg/semantic/testdata/maven-versions-generated.txt
+          path: generators/testdata/maven-versions-generated.txt
 
   generate-cran-versions:
     permissions:
@@ -193,7 +194,7 @@ jobs:
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: generated-cran-versions
-          path: pkg/semantic/testdata/cran-versions-generated.txt
+          path: generators/testdata/cran-versions-generated.txt
 
   test-semantic:
     permissions:
@@ -220,7 +221,7 @@ jobs:
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
         with:
           pattern: generated-*-versions
-          path: pkg/semantic/testdata/
+          path: generators/testdata/
           merge-multiple: true
       - run: git status
       - run: make test

generators/GenerateMavenVersions.java

@@ -275,7 +275,7 @@ public static String getSelectFilter() {
   }
 
   public static void main(String[] args) throws IOException {
-    String outfile = "pkg/semantic/testdata/maven-versions-generated.txt";
+    String outfile = "generators/testdata/maven-versions-generated.txt";
     Map<String, List<String>> packages = fetchPackageVersions();
 
     writeToFile(outfile, generatePackageCompares(packages));

pkg/semantic/compare_test.go generators/compare_test.gopkg/semantic/compare_test.go renamed to generators/compare_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	"github.com/g-rath/osv-detector/internal"
-	"github.com/g-rath/osv-detector/pkg/semantic"
+	"github.com/google/osv-scalibr/semantic"
 )
 
 func expectedResult(t *testing.T, comparator string) int {
@@ -96,7 +96,7 @@ func runAgainstEcosystemFixture(t *testing.T, ecosystem internal.Ecosystem, file
 func parseAsVersion(t *testing.T, str string, ecosystem internal.Ecosystem) semantic.Version {
 	t.Helper()
 
-	v, err := semantic.Parse(str, ecosystem)
+	v, err := semantic.Parse(str, string(ecosystem))
 
 	if err != nil {
 		t.Fatalf("failed to parse version '%s' as ecosystem '%s': %v", str, ecosystem, err)

generators/generate-alpine-versions.py

@@ -262,7 +262,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/testdata/alpine-versions-generated.txt'
+outfile = 'generators/testdata/alpine-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-cran-versions.R

@@ -170,7 +170,7 @@ fetch_packages_versions <- function() {
   return(extract_packages_with_versions(osvs))
 }
 
-outfile <- "pkg/semantic/testdata/cran-versions-generated.txt"
+outfile <- "generators/testdata/cran-versions-generated.txt"
 
 packs <- fetch_packages_versions()
 writeLines(generate_package_compares(packs), outfile, sep = "\n")

generators/generate-debian-versions.py

@@ -218,7 +218,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/testdata/debian-versions-generated.txt'
+outfile = 'generators/testdata/debian-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-packagist-versions.php

@@ -213,7 +213,7 @@ function compareVersions(array $lines, string $select = "all"): bool
   return $hasAnyFailed;
 }
 
-$outfile = "pkg/semantic/testdata/packagist-versions-generated.txt";
+$outfile = "generators/testdata/packagist-versions-generated.txt";
 
 /** @noinspection PhpUnhandledExceptionInspection */
 $packages = fetchPackageVersions();

generators/generate-pypi-versions.py

@@ -140,7 +140,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/testdata/pypi-versions-generated.txt'
+outfile = 'generators/testdata/pypi-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-redhat-versions.py

@@ -262,7 +262,7 @@ def fetch_packages_versions():
   return extract_packages_with_versions(osvs)
 
 
-outfile = 'pkg/semantic/testdata/redhat-versions-generated.txt'
+outfile = 'generators/testdata/redhat-versions-generated.txt'
 
 packs = fetch_packages_versions()
 with open(outfile, 'w') as f:

generators/generate-rubygems-versions.rb

@@ -132,7 +132,7 @@ def fetch_packages_versions
   extract_packages_with_versions(osvs)
 end
 
-outfile = "pkg/semantic/testdata/rubygems-versions-generated.txt"
+outfile = "generators/testdata/rubygems-versions-generated.txt"
 
 packs = fetch_packages_versions