From 5a076fcd01b3df44ed5b3bbafd726d02f12148f9 Mon Sep 17 00:00:00 2001 From: Sameera Priyatham Tadikonda Date: Tue, 2 Sep 2025 11:28:21 -0700 Subject: [PATCH 1/6] PDP-536: Adding copyright check --- .copyrightconfig | 14 ++++++++++++++ .github/workflows/pr-workflow.yaml | 16 ++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 .copyrightconfig create mode 100644 .github/workflows/pr-workflow.yaml diff --git a/.copyrightconfig b/.copyrightconfig new file mode 100644 index 0000000..3b9d4ec --- /dev/null +++ b/.copyrightconfig @@ -0,0 +1,14 @@ +# COPYRIGHT VALIDATION CONFIG +# --------------------------------- +# Required start year (keep fixed; end year auto-updates in check output) +startyear: 2019 + +# Optional exclusions list (comma-separated). Leave commented if none. +# Rules: +# - Relative paths (no leading ./) +# - Simple * wildcard only (no recursive **) +# - Use sparingly (third_party, generated, binary assets) +# - Dotfiles already skipped automatically +# Enable by removing the leading '# ' from the next line and editing values. +# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js +filesexcluded: .github/*, README.md \ No newline at end of file diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml new file mode 100644 index 0000000..8694fe5 --- /dev/null +++ b/.github/workflows/pr-workflow.yaml @@ -0,0 +1,16 @@ +name: PR workflow + +on: + # Using pull_request_target instead of pull_request to handle PRs from forks + pull_request_target: + types: [opened, edited, reopened, synchronize] + # No branch filtering - will run on all PRs + +jobs: + jira-pr-check: + name: 🏷️ Validate JIRA ticket ID + # Use the reusable workflow from the central repository + uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main + with: + # Pass the PR title from the event context + pr-title: ${{ github.event.pull_request.title }} \ No newline at end of file From 6a3f212564dede7a2df47e7a64e66569c0502048 Mon Sep 17 00:00:00 2001 From: SameeraPriyathamTadikonda Date: Tue, 2 Sep 2025 11:31:52 -0700 Subject: [PATCH 2/6] Add copyright check --- .github/workflows/pr-workflow.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml index 8694fe5..67e9bc8 100644 --- a/.github/workflows/pr-workflow.yaml +++ b/.github/workflows/pr-workflow.yaml @@ -13,4 +13,11 @@ jobs: uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main with: # Pass the PR title from the event context - pr-title: ${{ github.event.pull_request.title }} \ No newline at end of file + pr-title: ${{ github.event.pull_request.title }} + copyright-validation: + name: © Validate Copyright Headers + uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main + permissions: + contents: read + pull-requests: write + issues: write From 4f1c0f437999b827fc6823a93b215dcccf2eb8af Mon Sep 17 00:00:00 2001 From: Vitaly Date: Thu, 18 Jun 2026 12:17:05 -0700 Subject: [PATCH 3/6] Update README.md Add a message about incompatible version. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1b0ccf1..224d349 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ The Solution Template for MarkLogic on Azure helps to deploy clusters on Azure. For deploying MarkLogic on AWS, please visit [cloud-enablement-aws](https://github.com/marklogic/cloud-enablement-aws). +**⚠️ A backward incompatibility of significant impact was discovered in 12.0.2. We are working on a patch release to deliver a fix as soon as possible. In the meantime, we recommend that you do not upgrade and wait for the upcoming patch release.** + ## Getting Started [![Deploy To Azure](doc/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmarklogic%2Fcloud-enablement-azure%2F12.0-master%2FmainTemplate.json) From 65d60463ebc8b90806e3f5f867f377515c2915f4 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 19 Jun 2026 15:05:06 -0700 Subject: [PATCH 4/6] Update README.md Restore previous version. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 224d349..1b0ccf1 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,6 @@ The Solution Template for MarkLogic on Azure helps to deploy clusters on Azure. For deploying MarkLogic on AWS, please visit [cloud-enablement-aws](https://github.com/marklogic/cloud-enablement-aws). -**⚠️ A backward incompatibility of significant impact was discovered in 12.0.2. We are working on a patch release to deliver a fix as soon as possible. In the meantime, we recommend that you do not upgrade and wait for the upcoming patch release.** - ## Getting Started [![Deploy To Azure](doc/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmarklogic%2Fcloud-enablement-azure%2F12.0-master%2FmainTemplate.json) From 931d783b2df73d0e046317050680c43ae813371b Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 7 Jul 2026 08:26:26 -0700 Subject: [PATCH 5/6] MarkLogic 12.0.3 release --- mainTemplate.json | 8 ++++---- nestedtemplates/additionalNodeExt.json | 2 +- nestedtemplates/appGateway.json | 2 +- nestedtemplates/availabilitySet.json | 2 +- nestedtemplates/bootstrapNodeExt.json | 2 +- nestedtemplates/networkInterface.json | 2 +- nestedtemplates/networkSecurityGroup.json | 2 +- nestedtemplates/nodePublicIp.json | 2 +- nestedtemplates/virtualMachine.json | 2 +- nestedtemplates/virtualNetwork.json | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mainTemplate.json b/mainTemplate.json index 4b4b914..871ec6c 100644 --- a/mainTemplate.json +++ b/mainTemplate.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "DeploymentName": { "type": "string", @@ -150,7 +150,7 @@ "description": "The base URL for dependent assets" }, "minLength": 1, - "defaultValue": "https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/12.0.2" + "defaultValue": "https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/12.0.3" }, "_artifactsLocationSasToken": { "type": "securestring", @@ -168,7 +168,7 @@ } }, "variables": { - "templateVersion": "12.0.2", + "templateVersion": "12.0.3", "baseUrl": "[replace(parameters('_artifactsLocation'),'/mainTemplate.json','')]", "templateBaseUrl": "[concat(variables('baseUrl'),'/nestedtemplates/')]", "scriptBaseUrl": "[concat(variables('baseUrl'),'/scripts/')]", @@ -177,7 +177,7 @@ "enableAvailabilitySet": true, "enableHA": "[if(lessOrEquals(parameters('NumberOfNodes'),1),bool('false'),equals(parameters('HighAvailability'),'enable'))]", "imageOffer": "marklogic-12", - "imageSku": "[if(equals(parameters('ImageType'), 'RockyLinux8'), 'ml1202-rockylinux8', 'ml1202-rockylinux9')]", + "imageSku": "[if(equals(parameters('ImageType'), 'RockyLinux8'), 'ml1203-rockylinux8', 'ml1203-rockylinux9')]", "templateUrls": { "availabilitySetTemplateUrl": "[concat(variables('templateBaseUrl'),'availabilitySet.json',parameters('_artifactsLocationSasToken'))]", "vnetTemplateUrl": "[concat(variables('templateBaseUrl'),'virtualNetwork.json',parameters('_artifactsLocationSasToken'))]", diff --git a/nestedtemplates/additionalNodeExt.json b/nestedtemplates/additionalNodeExt.json index 03231f1..4036f53 100644 --- a/nestedtemplates/additionalNodeExt.json +++ b/nestedtemplates/additionalNodeExt.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "extSetting": { "type": "object" diff --git a/nestedtemplates/appGateway.json b/nestedtemplates/appGateway.json index 2616286..534167c 100644 --- a/nestedtemplates/appGateway.json +++ b/nestedtemplates/appGateway.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "appGatewaySetting": { "type": "object" diff --git a/nestedtemplates/availabilitySet.json b/nestedtemplates/availabilitySet.json index fa36db8..26075cb 100644 --- a/nestedtemplates/availabilitySet.json +++ b/nestedtemplates/availabilitySet.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "availabilitySetSetting": { "type": "object" diff --git a/nestedtemplates/bootstrapNodeExt.json b/nestedtemplates/bootstrapNodeExt.json index e7d79bc..c069b12 100644 --- a/nestedtemplates/bootstrapNodeExt.json +++ b/nestedtemplates/bootstrapNodeExt.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "extSetting": { "type": "object" diff --git a/nestedtemplates/networkInterface.json b/nestedtemplates/networkInterface.json index 0aedfe7..9b93db2 100644 --- a/nestedtemplates/networkInterface.json +++ b/nestedtemplates/networkInterface.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "networkInterfaceSetting": { "type": "object" diff --git a/nestedtemplates/networkSecurityGroup.json b/nestedtemplates/networkSecurityGroup.json index b3812f7..02a9800 100644 --- a/nestedtemplates/networkSecurityGroup.json +++ b/nestedtemplates/networkSecurityGroup.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "nsgSetting": { "type": "object" diff --git a/nestedtemplates/nodePublicIp.json b/nestedtemplates/nodePublicIp.json index 7839798..3293f0a 100644 --- a/nestedtemplates/nodePublicIp.json +++ b/nestedtemplates/nodePublicIp.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "nodePublicIpSetting": { "type": "object" diff --git a/nestedtemplates/virtualMachine.json b/nestedtemplates/virtualMachine.json index 5c0b400..75c85f1 100644 --- a/nestedtemplates/virtualMachine.json +++ b/nestedtemplates/virtualMachine.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "vmSetting": { "type": "object" diff --git a/nestedtemplates/virtualNetwork.json b/nestedtemplates/virtualNetwork.json index 35fa22a..06687ef 100644 --- a/nestedtemplates/virtualNetwork.json +++ b/nestedtemplates/virtualNetwork.json @@ -1,6 +1,6 @@ { "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "12.0.2", + "contentVersion": "12.0.3", "parameters": { "vnetSetting": { "type": "object" From 7588e8d8b2ede472580bdfe2c41f6e4781e2211d Mon Sep 17 00:00:00 2001 From: Vitaly Date: Tue, 7 Jul 2026 11:21:16 -0700 Subject: [PATCH 6/6] remove github workflows as these are managed on the org level --- .copyrightconfig | 14 -------------- .github/workflows/pr-workflow.yaml | 23 ----------------------- 2 files changed, 37 deletions(-) delete mode 100644 .copyrightconfig delete mode 100644 .github/workflows/pr-workflow.yaml diff --git a/.copyrightconfig b/.copyrightconfig deleted file mode 100644 index 3b9d4ec..0000000 --- a/.copyrightconfig +++ /dev/null @@ -1,14 +0,0 @@ -# COPYRIGHT VALIDATION CONFIG -# --------------------------------- -# Required start year (keep fixed; end year auto-updates in check output) -startyear: 2019 - -# Optional exclusions list (comma-separated). Leave commented if none. -# Rules: -# - Relative paths (no leading ./) -# - Simple * wildcard only (no recursive **) -# - Use sparingly (third_party, generated, binary assets) -# - Dotfiles already skipped automatically -# Enable by removing the leading '# ' from the next line and editing values. -# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js -filesexcluded: .github/*, README.md \ No newline at end of file diff --git a/.github/workflows/pr-workflow.yaml b/.github/workflows/pr-workflow.yaml deleted file mode 100644 index 67e9bc8..0000000 --- a/.github/workflows/pr-workflow.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: PR workflow - -on: - # Using pull_request_target instead of pull_request to handle PRs from forks - pull_request_target: - types: [opened, edited, reopened, synchronize] - # No branch filtering - will run on all PRs - -jobs: - jira-pr-check: - name: 🏷️ Validate JIRA ticket ID - # Use the reusable workflow from the central repository - uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main - with: - # Pass the PR title from the event context - pr-title: ${{ github.event.pull_request.title }} - copyright-validation: - name: © Validate Copyright Headers - uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main - permissions: - contents: read - pull-requests: write - issues: write