From 3e9dddb06ad0d03932ed0f80590c45b594c055dd Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 9 Oct 2023 19:20:23 -0700
Subject: [PATCH 1/2] .github/workflows/dist.yml: Create release on release tag

---
 .github/workflows/dist.yml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 3aaecc6a064..834041d1fca 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -39,12 +39,34 @@ jobs:
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
       - name: make dist
         run: |
-          ./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
+          ./bootstrap -D && ./configure && make dist
+        env:
+          MAKE: make -j8
       - uses: actions/upload-artifact@v3
         with:
-          path: "dist/*.tar.gz"
+          path: |
+            dist/*.tar.gz
+            upstream
           name: release_dist
 
+  release:
+
+    needs: release_dist
+    runs-on: ubuntu-latest
+    if: github.repository == 'sagemath/sage' && startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, 'beta') && !contains(github.ref, 'rc')
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: release_dist
+      - uses: softprops/action-gh-release@v1
+        with:
+          generate_release_notes: true
+          files: |
+            dist/*
+            upstream/*
+    permissions:
+      contents: write
+
   sdists_for_pypi:
 
     runs-on: ubuntu-latest

From 8ee6738e7a773893e578a0e4615995d9a4512faa Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Mon, 9 Oct 2023 21:33:38 -0700
Subject: [PATCH 2/2] .github/workflows/dist.yml (release_dist): First try
 without upstream_url, then fall back to with

---
 .github/workflows/dist.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 834041d1fca..de49bbc69a3 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -18,9 +18,8 @@ jobs:
 
   release_dist:
 
-    # This job, in contrast to "dist" in ci-macos.yml,
-    # does not use "configure --enable-download-from-upstream-url"
-    # (the default since #32390).
+    # This job first checks whether "configure --enable-download-from-upstream-url"
+    # (the default since #32390) is needed.
     #
     # In this way, we check that all necessary package tarballs
     # have already been uploaded to the Sage server at the time
@@ -37,12 +36,19 @@ jobs:
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
           sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
-      - name: make dist
+      - name: make dist (--disable-download-from-upstream-url)
         run: |
-          ./bootstrap -D && ./configure && make dist
+          ./bootstrap -D && ./configure --disable-download-from-upstream-url && make dist
+        env:
+          MAKE: make -j8
+      - name: make dist (--enable-download-from-upstream-url)
+        if: failure()
+        run: |
+          ./configure && make dist
         env:
           MAKE: make -j8
       - uses: actions/upload-artifact@v3
+        if: success() || failure()
         with:
           path: |
             dist/*.tar.gz
@@ -53,7 +59,7 @@ jobs:
 
     needs: release_dist
     runs-on: ubuntu-latest
-    if: github.repository == 'sagemath/sage' && startsWith(github.ref, 'refs/tags/') && ! contains(github.ref, 'beta') && !contains(github.ref, 'rc')
+    if: (success() || failure()) && github.repository == 'sagemath/sage' && startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') && !contains(github.ref, 'rc')
     steps:
       - uses: actions/download-artifact@v3
         with: