Skip to content

Commit 045f065

Browse files
author
Release Manager
committed
gh-37762: `dist.yml`: Download optional/experimental tarballs for GitHub Release assets <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> - Fixes #37752, at least for the non-"huge" tarballs (we skip the "huge" tarballs here). - More options for `sage -package download` (a subset of what `sage -package list` supports) - Also remove some zombie package files Test run: https://github.com/mkoeppe/sage/actions/workflows/dist.yml ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> - Depends on #37099 (merged to resolve merge conflict) URL: #37762 Reported by: Matthias Köppe Reviewer(s): Kwankyu Lee, Matthias Köppe
2 parents 7ace60e + a055882 commit 045f065

File tree

14 files changed

+87
-56
lines changed

14 files changed

+87
-56
lines changed

.github/workflows/dist.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,37 @@ jobs:
3737
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3838
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
3939
- name: make dist (--disable-download-from-upstream-url)
40+
id: make_dist
4041
run: |
4142
./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
4243
env:
4344
MAKE: make -j8
45+
- name: make download (--disable-download-from-upstream-url)
46+
id: make_download
47+
run: |
48+
make -k download DOWNLOAD_PACKAGES=":all: --no-file huge"
49+
env:
50+
MAKE: make -j8
51+
- name: Reconfigure with --enable-download-from-upstream-url
52+
if: (success() || failure()) && (steps.make_dist.outcome != 'success' || steps.make_download.outcome != 'success')
53+
run: |
54+
./configure
4455
- name: make dist (--enable-download-from-upstream-url)
45-
if: failure()
56+
if: (success() || failure()) && steps.make_dist.outcome != 'success'
4657
run: |
47-
./configure && make dist
58+
make dist
4859
env:
4960
MAKE: make -j8
61+
- name: make download (--enable-download-from-upstream-url)
62+
if: (success() || failure()) && steps.make_download.outcome != 'success'
63+
run: |
64+
make -k download DOWNLOAD_PACKAGES=":all: --no-file huge --allow-upstream"
65+
env:
66+
MAKE: make -j8
67+
- name: Remove what cannot be distributed
68+
if: success() || failure()
69+
run: |
70+
rm -f upstream/*do-not-distribute*
5071
- uses: actions/upload-artifact@v4
5172
if: success() || failure()
5273
with:

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,11 @@ reconfigure:
7979
fi
8080

8181
# Preemptively download all source tarballs of normal packages.
82+
DOWNLOAD_PACKAGES=:all:
8283
download:
8384
export SAGE_ROOT=$$(pwd) && \
8485
export PATH=$$SAGE_ROOT/build/bin:$$PATH && \
85-
sage-package download :all:
86+
sage-package download $(DOWNLOAD_PACKAGES)
8687

8788
dist: build/make/Makefile
8889
./sage --sdist

build/pkgs/deprecation/spkg-configure.m4

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/pcre/distros/alpine.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/pycygwin/spkg-configure.m4

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/setuptools_scm_git_archive/distros/alpine.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/setuptools_scm_git_archive/distros/arch.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/setuptools_scm_git_archive/distros/debian.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/setuptools_scm_git_archive/distros/fedora.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

build/pkgs/setuptools_scm_git_archive/distros/freebsd.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)