fix

snowflakedb · Nov 21, 2024 · 3825909 · 3825909
1 parent 08e50b3
commit 3825909
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 51 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -40,6 +40,21 @@ jobs:
                   CLOUD_PROVIDER: ${{ matrix.cloud_provider }}
                   PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
               run: ci/test_linux.sh
+            - name: Upload build log
+              uses: actions/upload-artifact@v4
+              with:
+                name: build log
+                path: build.log
+            - name: Upload warning report
+              uses: actions/upload-artifact@v4
+              with:
+                name: report
+                path: report.txt
+            - name: Upload warnings
+              uses: actions/upload-artifact@v4
+              with:
+                name: warnings
+                path: warnings.json
     build-test-win:
         name: Build-Test-Win
         runs-on: windows-2019

diff --git a/build.log b/build.log
diff --git a/ci/scripts/generate_warning_report.py b/ci/scripts/generate_warning_report.py
@@ -13,7 +13,6 @@
   223 |         size_t in_sizeOfBuffer,                                                                                                     <- snippet
 """
 message_re = re.compile(r"""(?P<file_path>[^:]*):(?P<line>\d+):(?:(?P<col>\d+):)?\s+warning:(?P<message>.*)\[(?P<flag>.*)\]""")
-snippet_re = re.compile(r"""\s+\d+\s+\| (?P<snippet>.*)""")
 
 class ParserState(enum.Enum):
     MESSAGE = "MESSAGE"
@@ -69,11 +68,7 @@ def parse_warnings(path: str) -> List[CompilerWarning]:
                 continue
 
             if state == ParserState.SNIPPET:
-                s_match = snippet_re.match(line)
-                if not s_match:
-                    print("Missing snippet following {}".format(warning.snippet), file=stderr)
-                else:
-                    warning.snippet = s_match.group("snippet")
+                warning.snippet = line
                 warning.source += line
 
                 state = ParserState.MESSAGE

diff --git a/ci/scripts/warning_report.sh b/ci/scripts/warning_report.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-python3 ci/scripts/generate_warning_report.py --build-log ./build.log --load-warnings ci/scripts/warnings_baseline.json --dump-warnings warnings.json --report report.txt
-cat report.txt
-cat warnings.json
+python3 ci/scripts/generate_warning_report.py --build-log build.log --load-warnings ci/scripts/warnings_baseline.json --dump-warnings warnings.json --report report.txt
diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -65,7 +65,7 @@ function zip_file()
 
     local zip_file_name=$(get_zip_file_name "$component_name" "$component_version" "$build_type")
 
-    if [[ -z "$GITHUB_ACTIONS" ]] && [[ -n "$GIT_BRANCH" ]]; then
+    if [[ -n "$GIT_BRANCH" ]]; then
         local f=$UTILS_DIR/../artifacts/$zip_file_name
         rm -f $f
         pushd $DEPENDENCY_DIR/
@@ -85,7 +85,7 @@ function zip_files()
 
     local zip_file_name=$(get_zip_file_name "$component_name" "$component_version" "$build_type")
 
-    if [[ -z "$GITHUB_ACTIONS" ]] && [[ -n "$GIT_BRANCH" ]]; then
+    if [[ -n "$GIT_BRANCH" ]]; then
         local f=$UTILS_DIR/../artifacts/$zip_file_name
         rm -f $f
         pushd $DEPENDENCY_DIR/