Skip to content

Commit 7144ca6

Browse files
committed
No 'make dist', so just use 'git archive'
1 parent 38e3810 commit 7144ca6

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

.github/workflows/ci-sage.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ concurrency:
5353

5454
env:
5555
# Ubuntu packages to install so that the project's "make dist" can succeed
56-
DIST_PREREQ: autoconf automake libtool
56+
DIST_PREREQ: git
5757
# Name of this project in the Sage distribution
5858
SPKG: macaulay2
5959
REMOVE_PATCHES: "*"
@@ -72,26 +72,10 @@ jobs:
7272
sudo DEBIAN_FRONTEND=noninteractive apt-get update
7373
sudo DEBIAN_FRONTEND=noninteractive apt-get install $DIST_PREREQ
7474
75-
# From test_build.yml
76-
77-
- name: Install requirements for Linux
78-
if: runner.os == 'Linux'
79-
run: |
80-
sudo add-apt-repository -y -n ppa:macaulay2/macaulay2
81-
sudo apt-get update
82-
sudo apt-get install -y -q --no-install-recommends clang-16 gfortran libtool-bin ninja-build yasm ccache
83-
sudo apt-get install -y -q --no-install-recommends liblzma-dev libboost-stacktrace-dev \
84-
libncurses-dev libncurses5-dev libreadline-dev libeigen3-dev libopenblas-dev libxml2-dev \
85-
libgc-dev libgdbm-dev libglpk-dev libgmp3-dev libgtest-dev libmpfr-dev libmpfi-dev libntl-dev gfan \
86-
libgivaro-dev libboost-regex-dev fflas-ffpack libflint-dev libmps-dev libfrobby-dev \
87-
libsingular-dev singular-data libcdd-dev cohomcalg topcom 4ti2 libnormaliz-dev normaliz coinor-csdp \
88-
libnauty-dev nauty lrslib polymake pipx phcpack w3c-markup-validator libtbb-dev qepcad libomp-16-dev msolve
89-
90-
9175
- name: Run make dist, prepare upstream artifact
9276
run: |
93-
(cd build/pkgs/${{ env.SPKG }}/src && cd M2 && ./autogen.sh && ./configure && make dist) \
94-
&& mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/M2/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
77+
(cd build/pkgs/${{ env.SPKG }}/src && git archive --format=tar.gz --prefix=${{ env.SPKG }}-git/ HEAD > ${{ env.SPKG }}-git.tar.gz) \
78+
&& mkdir -p upstream && cp build/pkgs/${{ env.SPKG }}/src/*.tar.gz upstream/${{ env.SPKG }}-git.tar.gz \
9579
&& echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=optional" > upstream/update-pkgs.sh \
9680
&& if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \
9781
&& ls -l upstream/

0 commit comments

Comments
 (0)