Merge pull request #77 from dinkelk/artifacts

Refine Github action artifacts
lasp · Sep 14, 2024 · 0a97404 · 0a97404
2 parents 3a00cef + 158e1cd
commit 0a97404
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build_user_guide.yml b/.github/workflows/build_user_guide.yml
@@ -25,14 +25,14 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: user_guide
-          path: doc/user_guide/build/pdf/user_guide.pdf
+          path: ${{ github.workspace }}/doc/user_guide/build/pdf/user_guide.pdf
           if-no-files-found: error
       - name: Build the architecture description document
         run: bash env/github_run.sh "redo doc/architecture_description_document/build/pdf/architecture_description_document.pdf"
       - name: Archive user guide PDF
         uses: actions/upload-artifact@v4
         with:
           name: architecture_description_document 
-          path: doc/architecture_description_document/build/pdf/architecture_description_document.pdf
+          path: ${{ github.workspace }}/doc/architecture_description_document/build/pdf/architecture_description_document.pdf
           if-no-files-found: error
       - run: echo "Finished with status - ${{ job.status }}."
diff --git a/.github/workflows/style_all.yml b/.github/workflows/style_all.yml
@@ -25,8 +25,8 @@ jobs:
         if: always() # Make sure this runs even if `redo style_all` fails
         uses: actions/upload-artifact@v4
         with:
-          name: failed_style_logs
-          path: build/failed_style_logs
+          name: style_logs
+          path: ${{ github.workspace }}/build
           if-no-files-found: ignore
       - run: echo "Finished with status - ${{ job.status }}."
         if: always()
diff --git a/.github/workflows/test_all.yml b/.github/workflows/test_all.yml
@@ -25,8 +25,8 @@ jobs:
         if: always() # Make sure this runs even if `redo test_all` fails
         uses: actions/upload-artifact@v4
         with:
-          name: failed_test_logs
-          path: ${{ github.workspace }}/build/failed_test_logs
+          name: test_logs
+          path: ${{ github.workspace }}/build
           if-no-files-found: ignore
       - run: echo "Finished with status - ${{ job.status }}."
         if: always()
diff --git a/redo/rules/build_style_all.py b/redo/rules/build_style_all.py
@@ -81,7 +81,9 @@ def build(self, redo_1, redo_2, redo_3):
 
         # Make a build directory at the top level:
         failed_style_log_dir = os.path.join(directory, "build" + os.sep + "failed_style_logs")
+        log_dir = os.path.join(directory, "build" + os.sep + "style_logs")
         filesystem.safe_makedir(failed_style_log_dir)
+        filesystem.safe_makedir(log_dir)
 
         # Run tests:
         exit_code = 0
@@ -96,7 +98,8 @@ def build(self, redo_1, redo_2, redo_3):
             sys.stderr.flush()
             database.setup.reset()
             try:
-                redo.redo([os.path.join(test, "style"), "2>/dev/null", "1>/dev/null"])
+                style_run_log = os.path.join(log_dir, rel_test.replace(os.sep, "_") + ".log")
+                redo.redo([os.path.join(test, "style"), "1>&2", "2>" + style_run_log])
 
                 # See if there is anything in the log file:
                 style_log = os.path.join(

diff --git a/redo/rules/build_test_all.py b/redo/rules/build_test_all.py
@@ -71,7 +71,7 @@ def build(self, redo_1, redo_2, redo_3):
 
         # Make a build directory at the top level:
         failed_test_log_dir = os.path.join(directory, "build" + os.sep + "failed_test_logs")
-        log_dir = os.path.join(directory, "build" + os.sep + "log")
+        log_dir = os.path.join(directory, "build" + os.sep + "test_logs")
         filesystem.safe_makedir(failed_test_log_dir)
         filesystem.safe_makedir(log_dir)