Skip to content

fix(conformance): enforce vendored upstream checksums #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magnusp merged 2 commits into from
Oct 21, 2026
Merged

fix(conformance): enforce vendored upstream checksums #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e085af
fix(conformance): enforce vendored upstream checksums
magnusp Oct 21, 2026
95e8912
fix(ci): stop vendoring check from breaking root validate
magnusp Oct 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,17 @@ jobs:
java-version: ${{ matrix.java-version }}
cache: 'maven'

- name: Verify vendored upstream integrity
run: ./tools/export-upstream --verify

- name: Self-check vendoring enforcement
run: ./tools/export-upstream --self-test

- name: Check Code Formatting (Spotless)
run: mvn --batch-mode spotless:check

- name: Validate reactor
run: mvn --batch-mode validate

- name: Run Tests and Verifications
run: mvn --batch-mode clean verify
9 changes: 9 additions & 0 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,17 @@ jobs:
java-version: ${{ matrix.java-version }}
cache: 'maven'

- name: Verify vendored upstream integrity
run: ./tools/export-upstream --verify

- name: Self-check vendoring enforcement
run: ./tools/export-upstream --self-test

- name: Check Code Formatting (Spotless)
run: mvn --batch-mode spotless:check

- name: Validate reactor
run: mvn --batch-mode validate

- name: Run Tests and Verifications
run: mvn --batch-mode clean verify
51 changes: 37 additions & 14 deletions libsql-conformance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,58 @@
<version>3.3.1</version>
<executions>
<execution>
<id>copy-xerial-test-sources</id>
<phase>generate-test-sources</phase>
<id>copy-docker-config</id>
<phase>pre-integration-test</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/generated-test-sources/xerial</outputDirectory>
<outputDirectory>${project.build.directory}/docker-config</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/../upstream-xerial_sqlite-jdbc/src/test/java</directory>
<directory>${project.basedir}/src/test/docker-config</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>copy-docker-config</id>
<phase>pre-integration-test</phase>
<id>verify-vendored-upstream</id>
<phase>generate-test-sources</phase>
<goals>
<goal>copy-resources</goal>
<goal>run</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/docker-config</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/test/docker-config</directory>
<filtering>false</filtering>
</resource>
</resources>
<target>
<exec executable="bash" failonerror="true">
<arg value="${project.basedir}/../tools/export-upstream" />
<arg value="--verify" />
</exec>
</target>
</configuration>
</execution>
<execution>
<id>copy-xerial-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<delete dir="${project.build.directory}/generated-test-sources/xerial" />
<copy todir="${project.build.directory}/generated-test-sources/xerial">
<fileset
dir="${project.basedir}/../upstream-xerial_sqlite-jdbc"
includesfile="${project.basedir}/../upstream-xerial_sqlite-jdbc.manifest" />
</copy>
</target>
</configuration>
</execution>
</executions>
Expand Down
Loading
Loading