Skip to content

Commit 71e4800

Browse files
Merge pull request #158 from mkoeppe/ci-sage-use-git-archive
ci-sage.yml: Use `git archive`, test with updated build dependencies
2 parents feb0508 + d4562c4 commit 71e4800

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

.github/workflows/ci-sage.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ on:
4444

4545
env:
4646
# Ubuntu packages to install so that the project's "make dist" can succeed
47-
DIST_PREREQ: libmpfr-dev
47+
DIST_PREREQ:
4848
# Name of this project in the Sage distribution
4949
SPKG: python_flint
5050
# Standard setting: Test the current beta release of Sage:
@@ -64,14 +64,10 @@ jobs:
6464
sudo DEBIAN_FRONTEND=noninteractive apt-get update
6565
sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ
6666
if: env.DIST_PREREQ != ''
67-
- uses: actions/setup-python@v5
68-
with:
69-
python-version: '3.10'
70-
- run: pip install build
7167
- name: Run make dist, prepare upstream artifact
7268
run: |
73-
(cd build/pkgs/${{ env.SPKG }}/src && python -m build --sdist) \
74-
&& mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/dist/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
69+
(cd build/pkgs/${{ env.SPKG }}/src && git archive --format=tar.gz --prefix=${{ env.SPKG }}-git/ HEAD > ${{ env.SPKG }}-git.tar.gz) \
70+
&& mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
7571
&& echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \
7672
&& if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \
7773
&& ls -l upstream/
@@ -87,7 +83,7 @@ jobs:
8783
targets: SAGE_CHECK=no SAGE_CHECK_flint=warn SAGE_CHECK_python_flint=yes python_flint
8884
# Standard setting: Test the current beta release of Sage:
8985
sage_repo: sagemath/sage
90-
sage_ref: refs/pull/37224/head
86+
sage_ref: refs/pull/38340/head
9187
#sage_ref: develop
9288
upstream_artifact: upstream
9389
# Docker targets (stages) to tag
@@ -106,7 +102,7 @@ jobs:
106102
targets: SAGE_CHECK=no SAGE_CHECK_flint=warn SAGE_CHECK_python_flint=yes python_flint
107103
# Standard setting: Test the current beta release of Sage:
108104
sage_repo: sagemath/sage
109-
sage_ref: refs/pull/37224/head
105+
sage_ref: refs/pull/38340/head
110106
#sage_ref: develop
111107
upstream_artifact: upstream
112108
needs: [dist]

0 commit comments

Comments
 (0)