From 2f1c64e17041e626db34f6812a7c019024c12958 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 26 Jun 2020 11:26:31 +0200 Subject: [PATCH] Fixed remove-on0-cleanup operation --- .github/workflows/release.yml | 2 +- .github/workflows/template-cleanup.yml | 4 ++-- CHANGELOG.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 18bd411..5967c07 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: release: name: Publish Plugin runs-on: ubuntu-latest - if: github.repository != 'JetBrains/intellij-platform-plugin-template' #REMOVE-IN-CLEANUP# + if: github.repository != 'JetBrains/intellij-platform-plugin-template' #REMOVE-ON-CLEANUP# steps: # Check out current repository diff --git a/.github/workflows/template-cleanup.yml b/.github/workflows/template-cleanup.yml index a041755..8b86b2c 100644 --- a/.github/workflows/template-cleanup.yml +++ b/.github/workflows/template-cleanup.yml @@ -43,8 +43,8 @@ jobs: find src -type f -exec sed -i "s/org.jetbrains.plugins.template/$GROUP/g" {} + find src -type f -exec sed -i "s/JetBrains/$ACTOR/g" {} + - # Remove lines marked with #REMOVE-IN-CLEANUP# - find . -type f -exec sed -i '/#REMOVE-IN-CLEANUP#/' + # Remove lines marked with #REMOVE-ON-CLEANUP# + find . -type f -exec sed -i '/#REMOVE-ON-CLEANUP#/d' {} + # Move content mkdir -p src/main/kotlin/${GROUP//.//} diff --git a/CHANGELOG.md b/CHANGELOG.md index 67e602f..0e36738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ## [Unreleased] ### Added - `settings.gradle.kts` for the [performance purposes](https://docs.gradle.org/current/userguide/organizing_gradle_projects.html#always_define_a_settings_file) +- `#REMOVE-ON-CLEANUP#` token to mark content to be removed with **Template Cleanup** workflow ### Changed - README proofreading