Merge branch 'master' of https://github.com/ballerina-platform/baller…

…ina-release
ballerina-platform · May 9, 2023 · 73b1a31 · 73b1a31
2 parents 7e3e3c2 + 4e0a637
commit 73b1a31
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 20 deletions.
diff --git a/.github/workflows/daily-full-build-2201.4.x.yml b/.github/workflows/daily-full-build-2201.4.x.yml
@@ -47,6 +47,7 @@ jobs:
           BALLERINA_BOT_EMAIL: ${{ secrets.BALLERINA_BOT_EMAIL }}
           BALLERINA_REVIEWER_BOT_TOKEN: ${{ secrets.BALLERINA_REVIEWER_BOT_TOKEN }}
           devCentralToken: ${{ secrets.BALLERINA_DEV_CENTRAL_ACCESS_TOKEN }}
+          SKIP_ARCHITECTURE_MODEL_GENERATOR_TESTS: true
 
       - name: Notify Build Failure
         if: ${{ failure() }}
@@ -145,7 +146,10 @@ jobs:
           yum install sudo -y
           sudo dnf install git -y
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.4.x
       - name: Download Ballerina rpm Installer
         uses: actions/download-artifact@v2
         with:
@@ -171,7 +175,10 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.4.x
       - name: Download MacOS Intaller Zip
         uses: actions/download-artifact@v2
         with:
@@ -211,7 +218,10 @@ jobs:
       - name: Install GUID Generator
         run: dotnet tool install -g dotnet-guid --version 0.5.2
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.4.x
       - name: Download Windows Intaller Zip
         uses: actions/download-artifact@v2
         with:

diff --git a/.github/workflows/daily-full-build-2201.5.x.yml b/.github/workflows/daily-full-build-2201.5.x.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Build Modules
         run: |
-          python dependabot/build_stdlibs_for_lang_updates.py 2201.5.0-stage true ballerina-platform master
+          python dependabot/full_build_pipeline_for_updated_stages.py 2201.5.x true ballerina-platform 2201.5.x
         env:
           BALLERINA_BOT_USERNAME: ${{ secrets.BALLERINA_BOT_USERNAME }}
           BALLERINA_BOT_TOKEN: ${{ secrets.BALLERINA_BOT_TOKEN }}
@@ -145,7 +145,10 @@ jobs:
           yum install sudo -y
           sudo dnf install git -y
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.5.x
       - name: Download Ballerina rpm Installer
         uses: actions/download-artifact@v2
         with:
@@ -171,7 +174,10 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.5.x
       - name: Download MacOS Intaller Zip
         uses: actions/download-artifact@v2
         with:
@@ -211,7 +217,10 @@ jobs:
       - name: Install GUID Generator
         run: dotnet tool install -g dotnet-guid --version 0.5.2
       - name: Download Ballerina Distribution
-        run: git clone https://github.com/ballerina-platform/ballerina-distribution.git
+        run: |
+          git clone https://github.com/ballerina-platform/ballerina-distribution.git
+          cd ballerina-distribution
+          git checkout 2201.5.x
       - name: Download Windows Intaller Zip
         uses: actions/download-artifact@v2
         with:

diff --git a/dashboard/stdlib_graph.gv b/dashboard/stdlib_graph.gv
@@ -89,8 +89,6 @@ digraph "Stdlib Dependency Graph" {
 	io -> os
 	io -> serdes
 	io -> xslt
-	regex -> log
-	regex -> uuid
 	time -> crypto
 	time -> file
 	time -> protobuf

diff --git a/dependabot/build_stdlibs_for_lang_updates.py b/dependabot/build_stdlibs_for_lang_updates.py
@@ -314,7 +314,6 @@ def change_version_to_snapshot():
         config_file.close()
 
 
-
 def write_failed_modules(failed_module_names):
     with open("failed_modules.txt", "w") as file:
         for module_name in failed_module_names:

diff --git a/dependabot/full_build_pipeline_for_updated_stages.py b/dependabot/full_build_pipeline_for_updated_stages.py
@@ -183,6 +183,7 @@ def build_stdlib_repositories(enable_tests):
             if exit_code != 0:
                 level_failed = True
                 failed_modules.append(module_name)
+            delete_module(module_name)
 
         if level_failed:
             write_failed_modules(failed_modules)
@@ -331,4 +332,12 @@ def write_failed_modules(failed_module_names):
         file.close()
 
 
+def delete_module(module_name):
+    global exit_code
+
+    exit_code = os.system(f"rm -rf ./{module_name}")
+    if exit_code != 0:
+        sys.exit(1)
+
+
 main()
diff --git a/dependabot/resources/extensions.json b/dependabot/resources/extensions.json
@@ -100,8 +100,16 @@
             "build_action_file": "build-timestamped-master",
             "send_notification": true,
             "dependents": [
-                "module-ballerina-log",
-                "module-ballerina-uuid"
+                "module-ballerinax-aws.lambda",
+                "module-ballerinax-azure.functions",
+                "module-ballerina-c2c",
+                "module-ballerinax-choreo",
+                "module-ballerinax-jaeger",
+                "module-ballerinax-prometheus",
+                "graphql-tools",
+                "openapi-tools",
+                "ballerina-dev-tools",
+                "asyncapi-tools"
             ]
         },
         {

diff --git a/dependabot/resources/full_build_ignore_modules.json b/dependabot/resources/full_build_ignore_modules.json
@@ -4,6 +4,13 @@
     "build-ignore-modules": [],
     "downstream-repo-branches": {}
   },
+  "2201.5.x": {
+    "test-ignore-modules": [],
+    "build-ignore-modules": [],
+    "downstream-repo-branches": {
+      "ballerina-dev-tools": "1.0.x"
+    }
+  },
   "2201.4.x": {
     "test-ignore-modules": [],
     "build-ignore-modules": [],
@@ -20,13 +27,5 @@
       "module-ballerina-grpc": "2201.3.x",
       "ballerina-dev-tools": "0.10.x"
     }
-  },
-  "2201.2.x": {
-    "test-ignore-modules": [],
-    "build-ignore-modules": ["module-ballerina-persist", "persist-tools", "ballerina-dev-tools"],
-    "downstream-repo-branches": {
-      "module-ballerina-c2c": "2201.2.x",
-      "openapi-tools": "1.2.x"
-    }
   }
 }