Use main branch for github actions

ballerina-platform · Nov 18, 2024 · 2b1c3e0 · 2b1c3e0
2 parents d276ad5 + 6abe582
commit 2b1c3e0
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/build-timestamped-master.yml b/.github/workflows/build-timestamped-master.yml
@@ -12,5 +12,5 @@ jobs:
   call_workflow:
     name: Run Build Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@java21
+    uses: ballerina-platform/ballerina-library/.github/workflows/build-timestamp-master-template.yml@main
     secrets: inherit
diff --git a/.github/workflows/build-with-bal-test-graalvm.yml b/.github/workflows/build-with-bal-test-graalvm.yml
@@ -30,7 +30,7 @@ jobs:
     call_stdlib_workflow:
         name: Run StdLib Workflow
         if: ${{ github.event_name != 'schedule' || (github.event_name == 'schedule' && github.repository_owner == 'ballerina-platform') }}
-        uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@java21
+        uses: ballerina-platform/ballerina-library/.github/workflows/build-with-bal-test-graalvm-template.yml@main
         with:
             lang_tag: ${{ inputs.lang_tag }}
             lang_version: ${{ inputs.lang_version }}

diff --git a/.github/workflows/central-publish.yml b/.github/workflows/central-publish.yml
@@ -15,7 +15,7 @@ jobs:
   call_workflow:
     name: Run Central Publish Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@java21
+    uses: ballerina-platform/ballerina-library/.github/workflows/central-publish-template.yml@main
     secrets: inherit
     with:
       environment: ${{ github.event.inputs.environment }}
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -9,7 +9,7 @@ jobs:
   call_workflow:
     name: Run Release Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@java21
+    uses: ballerina-platform/ballerina-library/.github/workflows/release-package-template.yml@main
     secrets: inherit
     with:
       package-name: constraint

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -6,5 +6,5 @@ jobs:
   call_workflow:
     name: Run PR Build Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@java21
+    uses: ballerina-platform/ballerina-library/.github/workflows/pull-request-build-template.yml@main
     secrets: inherit
diff --git a/.github/workflows/trivy-scan.yml b/.github/workflows/trivy-scan.yml
@@ -9,5 +9,5 @@ jobs:
   call_workflow:
     name: Run Trivy Scan Workflow
     if: ${{ github.repository_owner == 'ballerina-platform' }}
-    uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@java21
+    uses: ballerina-platform/ballerina-library/.github/workflows/trivy-scan-template.yml@main
     secrets: inherit
diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml
@@ -5,7 +5,11 @@
 
 [ballerina]
 dependencies-toml-version = "2"
+<<<<<<< HEAD
 distribution-version = "2201.11.0-20241112-214900-6b80ab87"
+=======
+distribution-version = "2201.11.0-20241111-172200-095db58f"
+>>>>>>> 6abe58256d21eb1ef051833c23c0dd34b6b28875
 
 [[package]]
 org = "ballerina"

diff --git a/gradle.properties b/gradle.properties
@@ -8,7 +8,11 @@ ballerinaGradlePluginVersion=2.2.3
 jacocoVersion=0.8.10
 githubSpotbugsVersion=6.0.18
 
-ballerinaLangVersion=2201.11.0-20241112-214900-6b80ab87
+<<<<<<< HEAD
+ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77
+=======
+ballerinaLangVersion=2201.11.0-20241117-133400-a3054b77
+>>>>>>> 6abe58256d21eb1ef051833c23c0dd34b6b28875
 
 # Test dependency
 stdlibTimeVersion=2.6.0-20241113-073800-201b904