Skip to content

Commit 0f0f8d6

Browse files
committed
Fix creation of package tarballs
1 parent 28b7af0 commit 0f0f8d6

File tree

1 file changed

+20
-38
lines changed

1 file changed

+20
-38
lines changed

.github/workflows/dist.yml renamed to .github/workflows/release.yml

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Prepare source distributions and wheels
1+
name: Release
22

33
on:
44
push:
@@ -12,71 +12,53 @@ on:
1212
- '[0-9]+.[0-9]+.[0-9]+.rc[0-9]+'
1313
pull_request:
1414
paths:
15-
- '.github/workflows/dist.yml'
15+
- '.github/workflows/release.yml'
1616
workflow_dispatch:
1717
# Allow to run manually
1818

1919
jobs:
2020

21-
release_dist:
22-
23-
# This job first checks whether "configure --enable-download-from-upstream-url"
24-
# (the default since #32390) is needed.
25-
#
26-
# In this way, we check that all necessary package tarballs
27-
# have already been uploaded to the Sage server at the time
28-
# of pushing a release tag.
29-
#
30-
# It also uses "bootstrap -D", thus checking that the "configure"
31-
# tarball has been uploaded to the Sage server at the time
32-
# of pushing a release tag.
33-
21+
package_tarballs:
3422
runs-on: ubuntu-latest
3523
steps:
3624
- uses: actions/checkout@v4
3725
- name: Install bootstrap prerequisites
3826
run: |
3927
sudo DEBIAN_FRONTEND=noninteractive apt-get update
4028
sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap _prereq)
41-
- name: make dist (--disable-download-from-upstream-url)
42-
id: make_dist
43-
run: |
44-
./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
45-
env:
46-
MAKE: make -j8
47-
- name: make download (--disable-download-from-upstream-url)
48-
id: make_download
49-
run: |
50-
make -k download DOWNLOAD_PACKAGES=":all: --no-file huge"
51-
env:
52-
MAKE: make -j8
53-
- name: Reconfigure with --enable-download-from-upstream-url
54-
if: (success() || failure()) && (steps.make_dist.outcome != 'success' || steps.make_download.outcome != 'success')
29+
30+
- name: Configure
5531
run: |
32+
./bootstrap
5633
./configure
57-
- name: make dist (--enable-download-from-upstream-url)
58-
if: (success() || failure()) && steps.make_dist.outcome != 'success'
34+
35+
- name: make dist
5936
run: |
6037
make dist
6138
env:
6239
MAKE: make -j8
63-
- name: make download (--enable-download-from-upstream-url)
64-
if: (success() || failure()) && steps.make_download.outcome != 'success'
40+
41+
- name: make download
6542
run: |
6643
make -k download DOWNLOAD_PACKAGES=":all: --no-file huge --allow-upstream"
6744
env:
6845
MAKE: make -j8
46+
6947
- name: Remove what cannot be distributed
70-
if: success() || failure()
7148
run: |
7249
rm -f upstream/*do-not-distribute*
50+
51+
- name: List files
52+
run: |
53+
ls -l dist
54+
ls -l upstream
55+
7356
- uses: actions/upload-artifact@v4
74-
if: success() || failure()
7557
with:
7658
path: |
7759
dist/*.tar.gz
7860
upstream
79-
name: release_dist
61+
name: package_tarballs
8062

8163
sdists:
8264

@@ -118,15 +100,15 @@ jobs:
118100
if: env.CAN_DEPLOY == 'true'
119101

120102
release:
121-
needs: [release_dist, sdists]
103+
needs: [package_tarballs, sdists]
122104
runs-on: ubuntu-latest
123105
if: github.ref_type == 'tag'
124106
permissions:
125107
contents: write
126108
steps:
127109
- uses: actions/download-artifact@v4
128110
with:
129-
name: release_dist
111+
name: package_tarballs
130112

131113
- uses: actions/download-artifact@v4
132114
with:

0 commit comments

Comments
 (0)