Merge with master

ballerina-platform · Dec 10, 2024 · 4ab4995 · 4ab4995
2 parents b8ffe8a + e896962
commit 4ab4995
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -17,3 +17,5 @@ jobs:
         if: ${{ github.repository_owner == 'ballerina-platform' }}
         uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main
         secrets: inherit
+        with:
+            additional-build-flags: "-x test"
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -13,4 +13,5 @@ jobs:
         uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main
         secrets: inherit
         with:
-            additional-ubuntu-test-flags: "-Pdisable=subscriptions"
+            additional-ubuntu-test-flags: "-x test"
+            additional-windows-test-flags: "-x test"
diff --git a/ballerina-tests/graphql-dataloader-test-suite/tests/01_dataloader_tests.bal b/ballerina-tests/graphql-dataloader-test-suite/tests/01_dataloader_tests.bal
@@ -68,8 +68,7 @@ isolated function testDataLoaderWithSubscription() returns error? {
 @test:Config {
     groups: ["dataloader", "mutation"],
     dependsOn: [
-        testDataLoaderWithQuery,
-        testDataLoaderWithSubscription
+        testDataLoaderWithQuery, testDataLoaderWithSubscription
     ],
     after: resetDispatchCounters
 }

diff --git a/ballerina-tests/graphql-service-test-suite/tests/30_graphiql_client.bal b/ballerina-tests/graphql-service-test-suite/tests/30_graphiql_client.bal
@@ -20,8 +20,7 @@ import ballerina/http;
 import ballerina/test;
 
 @test:Config {
-    groups: ["listener", "graphiql"],
-    enable: false
+    groups: ["listener", "graphiql"]
 }
 function testGraphiqlWithSamePathAsGraphQLService() returns error? {
     graphql:Error? result = basicListener.attach(graphiqlConfigService, "ballerina/graphiql");

diff --git a/...ina-tests/graphql-subscription-test-suite/modules/six/tests/01_subscription_six_tests.bal b/...ina-tests/graphql-subscription-test-suite/modules/six/tests/01_subscription_six_tests.bal
@@ -37,4 +37,4 @@ isolated function testConnectionClousureWhenPongNotRecived() returns error? {
     }
     test:assertTrue(response is error, "Expected connection clousure error");
     test:assertEquals((<error>response).message(), "Request timeout: Status code: 4408");
-}
+}
diff --git a/...ina-tests/graphql-subscription-test-suite/modules/two/tests/01_subscription_two_tests.bal b/...ina-tests/graphql-subscription-test-suite/modules/two/tests/01_subscription_two_tests.bal
@@ -113,8 +113,7 @@ isolated function testSubscriptionWithMultipleClients() returns error? {
 }
 
 @test:Config {
-    groups: ["subscriptions"],
-    enable: false
+    groups: ["subscriptions"]
 }
 isolated function testConnectionInitMessage() returns error? {
     string url = "ws://localhost:9091/subscriptions";

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.caching=true
 group=io.ballerina.stdlib
 version=1.15.0-SNAPSHOT
-ballerinaLangVersion=2201.11.0-20241204-121300-fc33b755
+ballerinaLangVersion=2201.11.0-20241209-162400-0c015833
 
 checkstylePluginVersion=10.12.0
 spotbugsPluginVersion=6.0.18
@@ -15,35 +15,35 @@ jacocoVersion=0.8.10
 
 # Ballerina Library Dependencies
 # Level 01
-stdlibIoVersion=1.7.0-20241121-173300-0fbd5d4
-stdlibTimeVersion=2.6.0-20241122-120400-97742a7
-stdlibUrlVersion=2.5.0-20241122-120400-67af694
+stdlibIoVersion=1.7.0-20241209-171400-26de7d8
+stdlibTimeVersion=2.6.0-20241209-171400-4b43c7d
+stdlibUrlVersion=2.5.0-20241209-171400-b09a145
 
 # Level 02
-stdlibConstraintVersion=1.6.0-20241122-133100-98689e2
-stdlibCryptoVersion=2.8.0-20241122-130800-24f1267
-stdlibLogVersion=2.11.0-20241122-150100-2e1a3ca
-stdlibOsVersion=1.9.0-20241122-071800-1fae486
-stdlibTaskVersion=2.6.0-20241122-124800-cb84357
+stdlibConstraintVersion=1.6.0-20241209-172100-2facdca
+stdlibCryptoVersion=2.8.0-20241209-172100-28a92b5
+stdlibLogVersion=2.11.0-20241209-174200-4ab1866
+stdlibOsVersion=1.9.0-20241209-172200-af4e3f3
+stdlibTaskVersion=2.6.0-20241209-172700-f6bf4fc
 
 # Level 03
-stdlibCacheVersion=3.9.0-20241122-182900-c956a97
-stdlibFileVersion=1.11.0-20241122-180900-dff344c
-stdlibMimeVersion=2.11.0-20241204-145000-6cef6a1
-stdlibUuidVersion=1.9.0-20241125-110300-5eb185d
+stdlibCacheVersion=3.9.0-20241209-173700-f1bd537
+stdlibFileVersion=1.11.0-20241209-180600-1aa2676
+stdlibMimeVersion=2.11.0-20241209-180600-aa73132
+stdlibUuidVersion=1.9.0-20241209-175500-c039f34
 
 # Level 04
-stdlibAuthVersion=2.13.0-20241125-094500-d380c71
+stdlibAuthVersion=2.13.0-20241209-180400-7e56348
 stdlibDataJsonDataVersion=1.0.0-20241125-114000-0c2f457
-stdlibJwtVersion=2.14.0-20241125-085500-10a9526
-stdlibOAuth2Version=2.13.0-20241126-071700-7eb9e0b
+stdlibJwtVersion=2.14.0-20241209-180600-f1a51a1
+stdlibOAuth2Version=2.13.0-20241209-180800-22f19ac
 
 # Level 05
-stdlibHttpVersion=2.13.0-20241126-181000-6585cc5
+stdlibHttpVersion=2.13.0-20241209-200000-1b8535c
 
 # Level 06
-stdlibWebsocketVersion=2.13.0-20241127-103500-476d1aa
+stdlibWebsocketVersion=2.13.0-20241209-205700-4bd3b42
 
 # Ballerinax Observer
-observeVersion=1.4.0-20241122-184200-c596093
-observeInternalVersion=1.4.0-20241122-185200-9e5b1bb
+observeVersion=1.4.0-20241209-171500-9472db2
+observeInternalVersion=1.4.0-20241209-172400-71fe9c4
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         test:assertTrue(response is error, "Expected connection clousure error");
         test:assertEquals((<error>response).message(), "Request timeout: Status code: 4408");
-    }
+    }