Merge pull request #362 from bnema/feat/osr-reliability-integration
chore(cef): adopt reliable OSR input stack
3 files · +12 -8
M go.mod +2 -2
| @@ -6,8 +6,8 @@ require ( | |||
| 6 | 6 | github.com/a-h/templ v0.3.1020 | |
| 7 | 7 | github.com/andybalholm/brotli v1.2.2 | |
| 8 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | |
| 9 | - | github.com/bnema/purego-cef v0.14.1 | |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.5 | |
| 9 | + | github.com/bnema/purego-cef v0.14.2 | |
| 10 | + | github.com/bnema/purego-cef2gtk v0.9.0 | |
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5 | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4 | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1 | |
| @@ -6,8 +6,8 @@ require ( | |||||
| 6 | github.com/a-h/templ v0.3.1020 | 6 | github.com/a-h/templ v0.3.1020 | ||
| 7 | github.com/andybalholm/brotli v1.2.2 | 7 | github.com/andybalholm/brotli v1.2.2 | ||
| 8 | github.com/bnema/purego v0.11.0-bnema.4 | 8 | github.com/bnema/purego v0.11.0-bnema.4 | ||
| 9 | - | github.com/bnema/purego-cef v0.14.1 | 9 | + | github.com/bnema/purego-cef v0.14.2 |
| 10 | - | github.com/bnema/purego-cef2gtk v0.8.5 | 10 | + | github.com/bnema/purego-cef2gtk v0.9.0 |
| 11 | github.com/bnema/purego-pipewire v0.1.5 | 11 | github.com/bnema/purego-pipewire v0.1.5 | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4 | 12 | github.com/bnema/purego-sqlite v0.1.4 | ||
| 13 | github.com/bnema/purego-webp v0.2.1 | 13 | github.com/bnema/purego-webp v0.2.1 | ||
M go.sum +4 -4
| @@ -12,10 +12,10 @@ github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ | |||
| 12 | 12 | github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w= | |
| 13 | 13 | github.com/bnema/purego v0.11.0-bnema.4 h1:uQjx9QtM945rD6HkwYzPGuVN7wKr5HrFKIWE3kRprbs= | |
| 14 | 14 | github.com/bnema/purego v0.11.0-bnema.4/go.mod h1:LHW8Sb4QO18dQaLVRU8tZCGM0SjsC+agFW/3M3nCUtg= | |
| 15 | - | github.com/bnema/purego-cef v0.14.1 h1:ZAlrGfFyk3Eel0Gct+ipzJnnNfpXfDX8NuoZfRKAKco= | |
| 16 | - | github.com/bnema/purego-cef v0.14.1/go.mod h1:r+qCMwzuI+wq3xo189x3NAWWpALWoWwjtk+8wVCK1Eg= | |
| 17 | - | github.com/bnema/purego-cef2gtk v0.8.5 h1:Qwt9DkvCVBNN52dp1jikFU5B2Sg3dB16ayi/T4+2Bhg= | |
| 18 | - | github.com/bnema/purego-cef2gtk v0.8.5/go.mod h1:w/5Bjkm+ZaZbDIDS+ysC5qTBcpb8/WOeGDva8i39ocM= | |
| 15 | + | github.com/bnema/purego-cef v0.14.2 h1:0tKXT00gFvWUsL3A4sX4kzD+3XRmPOif0ccwO9iokqU= | |
| 16 | + | github.com/bnema/purego-cef v0.14.2/go.mod h1:r+qCMwzuI+wq3xo189x3NAWWpALWoWwjtk+8wVCK1Eg= | |
| 17 | + | github.com/bnema/purego-cef2gtk v0.9.0 h1:i1jdYIHFO6y6eAhzQ4Djy1t9z1GyH5ZrgR18f6C92Gc= | |
| 18 | + | github.com/bnema/purego-cef2gtk v0.9.0/go.mod h1:EqgpNih2djBXD9j7R5gs+gZcdQxzSgkYF3rf7eC+5zo= | |
| 19 | 19 | github.com/bnema/purego-pipewire v0.1.5 h1:wQQF2uHt/kVV3qOkdSE1CV0noQYkHS2+v9MXkgdjxEw= | |
| 20 | 20 | github.com/bnema/purego-pipewire v0.1.5/go.mod h1:dn9RGRtNteqIarb8gTv97VD/FQgur7ZJ1BE/Ub9NYSk= | |
| 21 | 21 | github.com/bnema/purego-sqlite v0.1.4 h1:h2DCsYT1/Ps13Ua4knUNQmT5Xgj6eRx+DrywNcnFNEU= | |
| @@ -12,10 +12,10 @@ github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ | |||||
| 12 | github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w= | 12 | github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w= | ||
| 13 | github.com/bnema/purego v0.11.0-bnema.4 h1:uQjx9QtM945rD6HkwYzPGuVN7wKr5HrFKIWE3kRprbs= | 13 | github.com/bnema/purego v0.11.0-bnema.4 h1:uQjx9QtM945rD6HkwYzPGuVN7wKr5HrFKIWE3kRprbs= | ||
| 14 | github.com/bnema/purego v0.11.0-bnema.4/go.mod h1:LHW8Sb4QO18dQaLVRU8tZCGM0SjsC+agFW/3M3nCUtg= | 14 | github.com/bnema/purego v0.11.0-bnema.4/go.mod h1:LHW8Sb4QO18dQaLVRU8tZCGM0SjsC+agFW/3M3nCUtg= | ||
| 15 | - | github.com/bnema/purego-cef v0.14.1 h1:ZAlrGfFyk3Eel0Gct+ipzJnnNfpXfDX8NuoZfRKAKco= | 15 | + | github.com/bnema/purego-cef v0.14.2 h1:0tKXT00gFvWUsL3A4sX4kzD+3XRmPOif0ccwO9iokqU= |
| 16 | - | github.com/bnema/purego-cef v0.14.1/go.mod h1:r+qCMwzuI+wq3xo189x3NAWWpALWoWwjtk+8wVCK1Eg= | 16 | + | github.com/bnema/purego-cef v0.14.2/go.mod h1:r+qCMwzuI+wq3xo189x3NAWWpALWoWwjtk+8wVCK1Eg= |
| 17 | - | github.com/bnema/purego-cef2gtk v0.8.5 h1:Qwt9DkvCVBNN52dp1jikFU5B2Sg3dB16ayi/T4+2Bhg= | 17 | + | github.com/bnema/purego-cef2gtk v0.9.0 h1:i1jdYIHFO6y6eAhzQ4Djy1t9z1GyH5ZrgR18f6C92Gc= |
| 18 | - | github.com/bnema/purego-cef2gtk v0.8.5/go.mod h1:w/5Bjkm+ZaZbDIDS+ysC5qTBcpb8/WOeGDva8i39ocM= | 18 | + | github.com/bnema/purego-cef2gtk v0.9.0/go.mod h1:EqgpNih2djBXD9j7R5gs+gZcdQxzSgkYF3rf7eC+5zo= |
| 19 | github.com/bnema/purego-pipewire v0.1.5 h1:wQQF2uHt/kVV3qOkdSE1CV0noQYkHS2+v9MXkgdjxEw= | 19 | github.com/bnema/purego-pipewire v0.1.5 h1:wQQF2uHt/kVV3qOkdSE1CV0noQYkHS2+v9MXkgdjxEw= | ||
| 20 | github.com/bnema/purego-pipewire v0.1.5/go.mod h1:dn9RGRtNteqIarb8gTv97VD/FQgur7ZJ1BE/Ub9NYSk= | 20 | github.com/bnema/purego-pipewire v0.1.5/go.mod h1:dn9RGRtNteqIarb8gTv97VD/FQgur7ZJ1BE/Ub9NYSk= | ||
| 21 | github.com/bnema/purego-sqlite v0.1.4 h1:h2DCsYT1/Ps13Ua4knUNQmT5Xgj6eRx+DrywNcnFNEU= | 21 | github.com/bnema/purego-sqlite v0.1.4 h1:h2DCsYT1/Ps13Ua4knUNQmT5Xgj6eRx+DrywNcnFNEU= | ||
M internal/infrastructure/cef/first_presentation_collector_test.go +6 -2
| @@ -118,6 +118,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 118 | 118 | binary := filepath.Join(temp, "dumber") | |
| 119 | 119 | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | |
| 120 | 120 | ||
| 121 | + | const upstreamVersion = "v0.8.5-0.20300102030405-bbd397409ebe" | |
| 122 | + | const upstreamRevision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |
| 123 | + | goBin := collectorProvenanceGo(t, temp, upstreamVersion, upstreamRevision, "") | |
| 121 | 124 | output := filepath.Join(temp, "artifacts") | |
| 122 | 125 | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | |
| 123 | 126 | cmd.Dir = repoRoot | |
| @@ -129,6 +132,7 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 129 | 132 | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | |
| 130 | 133 | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | |
| 131 | 134 | "DUMBER_MACHINE_GPU_PROFILE=integrated-gpu", | |
| 135 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |
| 132 | 136 | ) | |
| 133 | 137 | result, err := cmd.CombinedOutput() | |
| 134 | 138 | require.NoErrorf(t, err, "collector failed: %s", result) | |
| @@ -144,9 +148,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||
| 144 | 148 | } | |
| 145 | 149 | for _, required := range []string{ | |
| 146 | 150 | `"measured_source_revision"`, | |
| 147 | - | `"version": "v0.8.5"`, | |
| 151 | + | `"version": "` + upstreamVersion + `"`, | |
| 148 | 152 | `"tag": "v0.8.5"`, | |
| 149 | - | `"revision": "b9fb46ef5c04ca0993943c5ca4b6f0fe83583304"`, | |
| 153 | + | `"revision": "` + upstreamRevision + `"`, | |
| 150 | 154 | } { | |
| 151 | 155 | require.Contains(t, artifacts.String(), required) | |
| 152 | 156 | } | |
| @@ -118,6 +118,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 118 | binary := filepath.Join(temp, "dumber") | 118 | binary := filepath.Join(temp, "dumber") | ||
| 119 | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | 119 | require.NoError(t, os.WriteFile(binary, collectorTestBinary(validFirstPresentationLog), 0o755)) | ||
| 120 | 120 | ||||
| 121 | + | const upstreamVersion = "v0.8.5-0.20300102030405-bbd397409ebe" | |||
| 122 | + | const upstreamRevision = "bbd397409ebed75a5979c1e4566a2ef319f6a484" | |||
| 123 | + | goBin := collectorProvenanceGo(t, temp, upstreamVersion, upstreamRevision, "") | |||
| 121 | output := filepath.Join(temp, "artifacts") | 124 | output := filepath.Join(temp, "artifacts") | ||
| 122 | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | 125 | cmd := exec.Command(filepath.Join(repoRoot, "scripts", "collect_first_presentation.sh")) | ||
| 123 | cmd.Dir = repoRoot | 126 | cmd.Dir = repoRoot | ||
| @@ -129,6 +132,7 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 129 | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | 132 | "DUMBER_FIRST_PRESENTATION_OUTPUT="+output, | ||
| 130 | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | 133 | "DUMBER_FIRST_PRESENTATION_TIMEOUT_SECONDS=1", | ||
| 131 | "DUMBER_MACHINE_GPU_PROFILE=integrated-gpu", | 134 | "DUMBER_MACHINE_GPU_PROFILE=integrated-gpu", | ||
| 135 | + | "PATH="+filepath.Dir(goBin)+":"+os.Getenv("PATH"), | |||
| 132 | ) | 136 | ) | ||
| 133 | result, err := cmd.CombinedOutput() | 137 | result, err := cmd.CombinedOutput() | ||
| 134 | require.NoErrorf(t, err, "collector failed: %s", result) | 138 | require.NoErrorf(t, err, "collector failed: %s", result) | ||
| @@ -144,9 +148,9 @@ func TestFirstPresentationCollectorSanitizesMachineLocalValues(t *testing.T) { | |||||
| 144 | } | 148 | } | ||
| 145 | for _, required := range []string{ | 149 | for _, required := range []string{ | ||
| 146 | `"measured_source_revision"`, | 150 | `"measured_source_revision"`, | ||
| 147 | - | `"version": "v0.8.5"`, | 151 | + | `"version": "` + upstreamVersion + `"`, |
| 148 | `"tag": "v0.8.5"`, | 152 | `"tag": "v0.8.5"`, | ||
| 149 | - | `"revision": "b9fb46ef5c04ca0993943c5ca4b6f0fe83583304"`, | 153 | + | `"revision": "` + upstreamRevision + `"`, |
| 150 | } { | 154 | } { | ||
| 151 | require.Contains(t, artifacts.String(), required) | 155 | require.Contains(t, artifacts.String(), required) | ||
| 152 | } | 156 | } | ||