Test CI wheel artifact handling

Author: cjdsellers

.github/actions/upload-artifact-wheel/action.yml

@@ -8,30 +8,30 @@ runs:
       shell: bash
       if:
         github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name ==
-        'nightly' || github.ref_name == 'master')
+        'nightly' || github.ref_name == 'master' || github.ref_name == 'test-ci')
       id: vars
       run: |
         if [ ! -d "./dist" ]; then
           echo "Error: dist directory not found"
           exit 1
         fi
 
-        ASSET_PATH=$(find ./dist -name "*.whl" -type f | xargs ls -t 2>/dev/null | head -n 1)
+        ASSET_PATH=$(find ./dist -name "nautilus_trader-*.whl" -type f | xargs ls -t 2>/dev/null | head -n 1)
 
         if [ -z "$ASSET_PATH" ]; then
-          echo "Error: No .whl files found in dist directory"
+          echo "Error: No nautilus_trader wheel files found in dist directory"
           exit 1
         fi
 
-        echo "ASSET_PATH=$ASSET_PATH" >> $GITHUB_ENV
         echo "ASSET_NAME=$(basename "$ASSET_PATH")" >> $GITHUB_ENV
 
     - name: Upload wheel artifact
       if:
         github.event_name == 'push' && (github.ref_name == 'develop' || github.ref_name ==
-        'nightly' || github.ref_name == 'master')
+        'nightly' || github.ref_name == 'master' || github.ref_name == 'test-ci')
       # https://github.com/actions/upload-artifact
+      # Use wildcard to flatten dist/ prefix: path before first wildcard is stripped
       uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       with:
         name: ${{ env.ASSET_NAME }}
-        path: ${{ env.ASSET_PATH }}
+        path: dist/nautilus_trader-*.whl

.github/workflows/build.yml

@@ -416,7 +416,7 @@ jobs:
       - name: Attest wheel provenance
         uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
-          subject-path: 'dist/*.whl'
+          subject-path: 'dist/nautilus_trader-*.whl'
 
       - name: Publish wheels to Cloudflare R2
         uses: ./.github/actions/publish-wheels
@@ -480,7 +480,7 @@ jobs:
       - name: Attest wheel provenance
         uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
-          subject-path: 'dist/*.whl'
+          subject-path: 'dist/nautilus_trader-*.whl'
 
       - name: Publish wheels to Cloudflare R2
         uses: ./.github/actions/publish-wheels
@@ -557,7 +557,7 @@ jobs:
       - name: Attest wheel provenance
         uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
-          subject-path: 'dist/*.whl'
+          subject-path: 'dist/nautilus_trader-*.whl'
 
       - name: Publish wheels to Cloudflare R2
         uses: ./.github/actions/publish-wheels
@@ -571,7 +571,7 @@ jobs:
           set +e
           success=false
           for i in {1..5}; do
-            gh release upload "$TAG_NAME" dist/*.whl --clobber --repo "$GITHUB_REPOSITORY"
+            gh release upload "$TAG_NAME" dist/nautilus_trader-*.whl --clobber --repo "$GITHUB_REPOSITORY"
             status=$?
             if [ $status -eq 0 ]; then
               success=true

scripts/ci/publish-wheels-generate-index.sh

@@ -45,7 +45,7 @@ declare -A final_hashes=()
 
 # First, calculate hashes for all new/updated wheels
 # These will override any existing hashes for the same filename
-for file in dist/all/*.whl; do
+for file in dist/nautilus_trader-*.whl; do
   if [[ -f "$file" ]]; then
     filename=$(basename "$file")
     hash=$(sha256sum "$file" | awk '{print $1}')
@@ -55,7 +55,7 @@ for file in dist/all/*.whl; do
 done
 
 # Get list of all wheel files in bucket
-existing_files=$(aws s3 ls "${bucket_path}" --endpoint-url="${CLOUDFLARE_R2_URL}" | grep '\.whl$' | awk '{print $4}')
+existing_files=$(aws s3 ls "${bucket_path}" --endpoint-url="${CLOUDFLARE_R2_URL}" | grep 'nautilus_trader-.*\.whl$' | awk '{print $4}')
 
 # For existing files, use hash from index if we don't have a new one
 for file in $existing_files; do

scripts/ci/publish-wheels-r2-upload-new-wheels.sh

@@ -3,27 +3,18 @@ set -euo pipefail
 
 echo "Uploading new wheels to Cloudflare R2..."
 
-echo "Initial dist/ contents:"
+echo "dist/ contents:"
 ls -la dist/
-find dist/ -type f -name "*.whl" -ls
+find dist/ -type f -name "nautilus_trader-*.whl" -ls
 
-# Create clean directory for real files
-mkdir -p dist/all
-
-# Copy all files into dist/all/ to resolve symlinks
-find dist/ -type f -name "*.whl" -exec cp -L {} dist/all/ \;
-
-# First check for any wheels
-if ! find dist/all/ -type f -name "*.whl" > /dev/null 2>&1; then
-  echo "No wheels found in dist/all/, exiting"
+# Verify wheels exist
+if ! find dist/ -type f -name "nautilus_trader-*.whl" -print -quit | grep -q .; then
+  echo "ERROR: No wheels found in dist/"
   exit 1
 fi
 
-echo "Contents of dist/all/:"
-ls -la dist/all/
-
 wheel_count=0
-for file in dist/all/*.whl; do
+for file in dist/nautilus_trader-*.whl; do
   echo "File details for $file:"
   ls -l "$file"
   file "$file"

scripts/ci/validate-wheel-count.sh

@@ -18,12 +18,12 @@ fi
 
 echo "Validating wheel count in dist/ directory..."
 
-wheel_count=$(find dist/ -name "*.whl" -type f | wc -l)
+wheel_count=$(find dist/ -name "nautilus_trader-*.whl" -type f | wc -l)
 
 if [ "$wheel_count" -ne "$expected_count" ]; then
   echo "ERROR: Expected $expected_count wheels, found $wheel_count" >&2
   echo "Downloaded wheels:" >&2
-  find dist/ -name "*.whl" -type f -ls >&2
+  find dist/ -name "nautilus_trader-*.whl" -type f -ls >&2
   exit 1
 fi