fix Anastasia suggestion. bring back prevent upload logic

neondatabase · Jul 26, 2023 · 411a859 · 411a859
1 parent 9d34559
commit 411a859
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -944,9 +944,9 @@ jobs:
         run: rm -rf ~/.ecr
 
   upload-postgres-extensions-to-s3:
-    # if: |
-    #   (github.ref_name == 'main' || github.ref_name == 'release') &&
-    #    github.event_name != 'workflow_dispatch'
+    if: |
+      (github.ref_name == 'main' || github.ref_name == 'release') &&
+       github.event_name != 'workflow_dispatch'
     runs-on: ${{ github.ref_name == 'release' && fromJSON('["self-hosted", "prod", "x64"]') || fromJSON('["self-hosted", "gen3", "small"]') }}
     needs: [ tag, promote-images ]
     strategy:

diff --git a/scripts/combine_control_files.py b/scripts/combine_control_files.py
@@ -67,8 +67,8 @@
                 .split("\n")
             )
             for file in file_list:
-                if ".so" in file:
-                    lib_name = file.replace("lib/", "").replace(".so", "")
+                if file.endswith('.so') and file.startswith("lib/"):
+                    lib_name = file[4:-3]
                     library_index[lib_name] = extension.name.replace(".tar.zst", "")
 
     all_data = {