From 65662023834771003544c2308c3caaa2ddb4c198 Mon Sep 17 00:00:00 2001 From: Vivek Narang Date: Sat, 8 Nov 2025 18:12:29 -0500 Subject: [PATCH 1/2] Remove check for CHANGES.txt edits --- .github/workflows/validate-changelog.yml | 21 ------------------- ...986-remove-check-for-CHANGES-txt-edits.yml | 8 +++++++ 2 files changed, 8 insertions(+), 21 deletions(-) create mode 100644 changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml diff --git a/.github/workflows/validate-changelog.yml b/.github/workflows/validate-changelog.yml index e5b7cf158ac..2e1e02ffef6 100644 --- a/.github/workflows/validate-changelog.yml +++ b/.github/workflows/validate-changelog.yml @@ -26,27 +26,6 @@ jobs: echo "skip=false" >> $GITHUB_OUTPUT fi - - name: Check for CHANGES.txt edits - if: steps.check-label.outputs.skip == 'false' - run: | - # Get the list of changed files - CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD) - - if echo "$CHANGED_FILES" | grep -q "^solr/CHANGES\.txt$"; then - echo "::error::Use of solr/CHANGES.txt is deprecated. Please create a changelog yaml file instead." - echo "" - echo "Instead of editing CHANGES.txt, please:" - echo "1. Run: ./gradlew writeChangelog" - echo "2. Edit the generated YAML file in changelog/unreleased/" - echo "3. Commit both the code change and the YAML file" - echo "" - echo "For more information, see: dev-docs/changelog.adoc" - echo "" - echo "If this PR should not have a changelog entry (e.g., documentation-only changes)," - echo "add the 'no-changelog' label to this PR." - exit 1 - fi - - name: Check for changelog entry if: steps.check-label.outputs.skip == 'false' run: | diff --git a/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml b/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml new file mode 100644 index 00000000000..73ae1e725f0 --- /dev/null +++ b/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml @@ -0,0 +1,8 @@ +# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc +title: Remove check for CHANGES txt edits +type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other +authors: + - name: Vivek Narang +links: + - name: SOLR-17986 + url: https://issues.apache.org/jira/browse/SOLR-17986 From 24b3875238be56808a79a819fb634a90a3ffcd3f Mon Sep 17 00:00:00 2001 From: Vivek Narang Date: Sun, 9 Nov 2025 09:13:05 -0500 Subject: [PATCH 2/2] Remove changelog yaml file --- .../SOLR-17986-remove-check-for-CHANGES-txt-edits.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml diff --git a/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml b/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml deleted file mode 100644 index 73ae1e725f0..00000000000 --- a/changelog/unreleased/SOLR-17986-remove-check-for-CHANGES-txt-edits.yml +++ /dev/null @@ -1,8 +0,0 @@ -# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc -title: Remove check for CHANGES txt edits -type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other -authors: - - name: Vivek Narang -links: - - name: SOLR-17986 - url: https://issues.apache.org/jira/browse/SOLR-17986