split into two artifacts

Author: anarchivist

.github/workflows/build.yml

@@ -124,6 +124,12 @@ jobs:
       compose-config: ${{ steps.artifacts.outputs.compose-config }}
       docker-events: ${{ steps.artifacts.outputs.docker-events }}
     steps:
+      - name: Set ARTIFACTS_DIR
+        run: echo "ARTIFACTS_DIR=${RUNNER_TEMP}/artifacts" >> $GITHUB_ENV
+
+      - name: Create the artifacts directory
+        run: mkdir -p "$ARTIFACTS_DIR/unittests"
+
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -159,22 +165,27 @@ jobs:
           AIRFLOW__DATABASE__SQL_ALCHEMY_CONN: ::add-mask::postgresql+psycopg2://airflow:airflow@postgres/airflow
           AIRFLOW__CELERY__RESULT_BACKEND: ::add-mask::db+postgresql://airflow:airflow@postgres/airflow
         run: |
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "compose-logs<<$EOF" | tee -a "$GITHUB_OUTPUT"
-          docker compose logs | tee -a "$GITHUB_OUTPUT"
-          echo "$EOF" | tee -a "$GITHUB_OUTPUT"
-          echo "compose-config<<$EOF" | tee -a "$GITHUB_OUTPUT"
-          docker compose config | tee -a "$GITHUB_OUTPUT"
-          echo "$EOF" | tee -a "$GITHUB_OUTPUT"
-          echo "docker-events<<$EOF" | tee -a "$GITHUB_OUTPUT"
-          docker events --format '{{ json . }}' --since $TEST_START --until `date +%s` | tee -a "$GITHUB_OUTPUT"
-          echo "$EOF" | tee -a "$GITHUB_OUTPUT"
+          docker compose logs | tee "${ARTIFACTS_DIR}/docker-services.log"
+          docker compose config | tee "${ARTIFACTS_DIR}/docker-compose.merged.yml"
+          docker events --json --since $TEST_START --until `date +%s` | tee "${ARTIFACTS_DIR}/docker-events.json"
+
+      - name: Upload test report
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: mokelumne Docker Test Report (${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }})
+          path: ${{ env.ARTIFACTS_DIR }}
+          if-no-files-found: error
 
   test-dag-imports:
     runs-on: ubuntu-24.04
-    outputs:
-      xmlrunner: ${{ steps.artifacts.outputs.xmlrunner }}
     steps:
+      - name: Set ARTIFACTS_DIR
+        run: echo "ARTIFACTS_DIR=${RUNNER_TEMP}/artifacts" >> $GITHUB_ENV
+
+      - name: Create the artifacts directory
+        run: mkdir -p "$ARTIFACTS_DIR/unittests"
+
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -188,50 +199,20 @@ jobs:
         run: |
           python test/run_tests.py
 
-      - name: Copy out artifacts
-        id: artifacts
-        if: ${{ always() }}
-        run: |
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "xmlrunner<<$EOF" | tee -a "$GITHUB_OUTPUT"
-          cat artifacts/unittest/airflow_test.xml | tee -a "$GITHUB_OUTPUT"
-          echo "$EOF" | tee -a "$GITHUB_OUTPUT"
-
-  upload-artifacts:
-    runs-on: ubuntu-24.04
-    needs:
-      - test-startup
-      - test-dag-imports
-    steps:
-      - name: Set ARTIFACTS_DIR
-        run: echo "ARTIFACTS_DIR=${RUNNER_TEMP}/artifacts" >> $GITHUB_ENV
-
-      - name: Create the artifacts directory
-        run: mkdir -p "$ARTIFACTS_DIR/unittests"
-      - name: Create artifact outputs
-        env:
-          COMPOSE_CONFIG: ${{ needs.test-startup.outputs.compose-config }}
-          COMPOSE_LOGS: ${{ needs.test-startup.outputs.compose-logs }}
-          DOCKER_EVENTS: ${{ needs.test-startup.outputs.docker-events }}
-          XMLRUNNER: ${{ needs.test-dag-imports.outputs.xmlrunner }}
-        run: |
-          echo "$COMPOSE_CONFIG" | tee "$ARTIFACTS_DIR/docker-compose.merged.yml"
-          echo "$COMPOSE_LOGS" | tee "$ARTIFACTS_DIR/docker-services.log"
-          echo "$DOCKER_EVENTS" | tee "$ARTIFACTS_DIR/docker-events.json"
-          echo "$XMLRUNNER" | tee "$ARTIFACTS_DIR/unittests/airflow_test.xml"
       - name: Upload test report
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
         with:
-          name: mokelumne Test Report (${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }})
+          name: mokelumne Python Test Report (${{ github.sha }}-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }})
           path: ${{ env.ARTIFACTS_DIR }}
           if-no-files-found: error
 
   push:
     runs-on: ubuntu-24.04
     needs:
       - merge
-      - upload-artifacts
+      - test-dag-imports
+      - test-startup
     env:
       DOCKER_APP_IMAGE: ${{ needs.merge.outputs.image }}
     steps: