Fix broken artifact upload (#824)

- Fixes upload-artifact and download-artifact usage to account for their
breaking changes
- Fixes sinter not declaring recursive inclusions in its manifest

Author: Strilanc

.github/workflows/ci.yml

@@ -153,25 +153,36 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
       - run: python dev/overwrite_dev_versions_with_date.py
-      - run: mkdir -p output/stim
-      - run: mkdir -p output/stimcirq
-      - run: mkdir -p output/sinter
       - run: python -m pip install pybind11~=2.11.1 cibuildwheel~=2.16.2 setuptools wheel
       - run: python -m cibuildwheel --print-build-identifiers
-      - run: python -m cibuildwheel --output-dir output/stim
+      - run: python -m cibuildwheel --output-dir dist
+      - uses: actions/upload-artifact@v4.4.0
+        with:
+          name: "dist-${{ matrix.os_dist.os }}-${{ matrix.os_dist.dist }}-${{ matrix.os_dist.macosarch }}"
+          path: dist/*
+  build_sdist:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v3
+      - run: python -m pip install setuptools pybind11~=2.11.1
+      - run: python dev/overwrite_dev_versions_with_date.py
+      - run: mkdir output
       - run: python setup.py sdist
       - run: cd glue/cirq && python setup.py sdist
       - run: cd glue/sample && python setup.py sdist
-      - run: mv dist/* output/stim
-      - run: mv glue/cirq/dist/* output/stimcirq
-      - run: mv glue/sample/dist/* output/sinter
       - uses: actions/upload-artifact@v4.4.0
         with:
-          name: "dist-${{ matrix.os_dist.os }}-${{ matrix.os_dist.dist }}-${{ matrix.os_dist.macosarch }}"
-          path: |
-            ./output/stimcirq/*.tar.gz
-            ./output/sinter/*.tar.gz
-            ./output/stim/*
+          name: "dist-sdist-sinter"
+          path: glue/sample/dist/*.tar.gz
+      - uses: actions/upload-artifact@v4.4.0
+        with:
+          name: "dist-sdist-stimcirq"
+          path: glue/cirq/dist/*.tar.gz
+      - uses: actions/upload-artifact@v4.4.0
+        with:
+          name: "dist-sdist-stim"
+          path: dist/*.tar.gz
   check_sdist_installs:
     runs-on: ubuntu-latest
     steps:
@@ -181,7 +192,7 @@ jobs:
       - run: python setup.py sdist
       - run: pip install dist/*.tar.gz
   merge_upload_artifacts:
-    needs: ["build_dist"]
+    needs: ["build_dist", "build_sdist"]
     runs-on: ubuntu-latest
     steps:
       - name: Merge Artifacts

glue/sample/MANIFEST.in

@@ -0,0 +1 @@
+recursive-include src *.py