Skip to content

Skip sqlite3 geopoly test on Windows #700

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
merged 2 commits into from
Jul 11, 2025
Merged

Skip sqlite3 geopoly test on Windows #700

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
4685789
For non-release CI, upload before validating
geofft Jun 29, 2025
59161cf
Skip sqlite3 geopoly test on Windows
geofft Jul 11, 2025
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
52 changes: 26 additions & 26 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,19 @@ jobs:

./build-linux.py --target-triple ${{ matrix.target_triple }} --python cpython-${{ matrix.python }} --options ${{ matrix.build_options }}

- name: Generate attestations
uses: actions/attest-build-provenance@v2
if: ${{ github.ref == 'refs/heads/main' }}
with:
subject-path: dist/*

- name: Upload Distribution
if: ${{ ! matrix.dry-run }}
uses: actions/upload-artifact@v4
with:
name: cpython-${{ matrix.python }}-${{ matrix.target_triple }}-${{ matrix.build_options }}
path: dist/*

- name: Validate Distribution
if: ${{ ! matrix.dry-run }}
run: |
Expand All @@ -267,19 +280,6 @@ jobs:

build/pythonbuild validate-distribution ${EXTRA_ARGS} dist/*.tar.zst

- name: Generate attestations
uses: actions/attest-build-provenance@v2
if: ${{ github.ref == 'refs/heads/main' }}
with:
subject-path: dist/*

- name: Upload Distribution
if: ${{ ! matrix.dry-run }}
uses: actions/upload-artifact@v4
with:
name: cpython-${{ matrix.python }}-${{ matrix.target_triple }}-${{ matrix.build_options }}
path: dist/*

build-1:
needs:
- generate-matrix
Expand Down Expand Up @@ -349,6 +349,19 @@ jobs:

./build-linux.py --target-triple ${{ matrix.target_triple }} --python cpython-${{ matrix.python }} --options ${{ matrix.build_options }}

- name: Generate attestations
uses: actions/attest-build-provenance@v2
if: ${{ github.ref == 'refs/heads/main' }}
with:
subject-path: dist/*

- name: Upload Distribution
if: ${{ ! matrix.dry-run }}
uses: actions/upload-artifact@v4
with:
name: cpython-${{ matrix.python }}-${{ matrix.target_triple }}-${{ matrix.build_options }}
path: dist/*

- name: Validate Distribution
if: ${{ ! matrix.dry-run }}
run: |
Expand All @@ -366,16 +379,3 @@ jobs:
fi

build/pythonbuild validate-distribution ${EXTRA_ARGS} dist/*.tar.zst

- name: Generate attestations
uses: actions/attest-build-provenance@v2
if: ${{ github.ref == 'refs/heads/main' }}
with:
subject-path: dist/*

- name: Upload Distribution
if: ${{ ! matrix.dry-run }}
uses: actions/upload-artifact@v4
with:
name: cpython-${{ matrix.python }}-${{ matrix.target_triple }}-${{ matrix.build_options }}
path: dist/*
12 changes: 6 additions & 6 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,6 @@ jobs:
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\${{ matrix.vcvars }}"
py.exe -3.12 build-windows.py --python cpython-${{ matrix.python }} --sh c:\cygwin\bin\sh.exe --options ${{ matrix.build_options }}

- name: Validate Distribution
if: ${{ ! matrix.dry-run }}
run: |
$Dists = Resolve-Path -Path "dist/*.tar.zst" -Relative
.\pythonbuild.exe validate-distribution --run $Dists

- name: Generate attestations
uses: actions/attest-build-provenance@v2
if: ${{ github.ref == 'refs/heads/main' }}
Expand All @@ -163,3 +157,9 @@ jobs:
with:
name: cpython-${{ matrix.python }}-${{ matrix.vcvars }}-${{ matrix.build_options }}
path: dist/*

- name: Validate Distribution
if: ${{ ! matrix.dry-run }}
run: |
$Dists = Resolve-Path -Path "dist/*.tar.zst" -Relative
.\pythonbuild.exe validate-distribution --run $Dists
6 changes: 5 additions & 1 deletion src/verify_distribution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ def test_sqlite(self):
cursor.execute("CREATE VIRTUAL TABLE fts3 USING fts3(sender, title, body);")
cursor.execute("CREATE VIRTUAL TABLE fts4 USING fts4(sender, title, body);")
cursor.execute("CREATE VIRTUAL TABLE fts5 USING fts5(sender, title, body);")
cursor.execute("CREATE VIRTUAL TABLE geopoly USING geopoly();")
cursor.execute("CREATE VIRTUAL TABLE rtree USING rtree(id, minX, maxX);")
if os.name != "nt":
# TODO(geofft): not sure why this isn't present in the prebuilt
# sqlite3 Windows library from CPython upstream, it seems weird to
# be inconsistent across platforms, but that's the status quo
cursor.execute("CREATE VIRTUAL TABLE geopoly USING geopoly();")
conn.close()

def test_ssl(self):
Expand Down