Cleanup publish process

cedricziel · cedricziel · commit 91e60494d67b · 2021-04-18T21:24:56.000+02:00
Use canonical project to patch

Adjust headerParserRegex to capture format

Customize publishing

Adjust changelog
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,7 +76,7 @@ jobs:
           # Set output from previous step
           export "ORG_GRADLE_PROJECT_pluginVersion=${{ steps.properties.outputs.prefixed-version }}"
 
-          ./gradlew publishPlugin
+          ./gradlew :typo3-cms:patchChangelog :typo3-cms:publishPlugin :lang-fluid:publishPlugin :lang-typoscript:publishPlugin
 
   # Patch changelog, commit and push to the current repository
   changelog:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 ## [Unreleased]
 ### Added
+
+### Changed
+- Improve publishing through GitHub actions
+- Grab version number from changelog correctly
+- Use "nightly" channel for TypoScript and Fluid projects
+- Fix syntax of release task
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+## [0.7.0]
+### Added
 - Use GitHub actions to build plugin instead of travis
 - c2b9eca [T3CMS] allowed TCA field can contain CSV string of tables (#351) (Cedric Ziel)
 - f7e3bb4 [T3CMS] Create convenience method to get locale (#350) (Cedric Ziel)
diff --git a/build.gradle b/build.gradle
@@ -12,11 +12,6 @@ repositories {
 }
 
 def htmlFixer = { htmlFile -> file(htmlFile).text.replace('<html>', '').replace('</html>', '') }
-def getDate() {
-    def date = new Date()
-    def formattedDate = date.format('yyyy-MM-dd')
-    return formattedDate
-}
 
 group pluginGroup
 
@@ -45,8 +40,7 @@ subprojects {
     changelog {
         version = pluginVersion
         path = "${project.rootProject.projectDir}/CHANGELOG.md"
-        header = { "[$version] - ${getDate()}" }
-        headerParserRegex = ~/\d+\.\d+/
+        headerParserRegex = ~/\d+\.\d+\.\d+/
         itemPrefix = "-"
         keepUnreleasedSection = true
         unreleasedTerm = "[Unreleased]"
@@ -64,10 +58,6 @@ subprojects {
         }
     }
 
-    publishPlugin {
-        token System.getenv('IJ_REPO_TOKEN')
-    }
-
     patchPluginXml {
         if (customSinceBuild) {
             sinceBuild customSinceBuild
@@ -76,7 +66,7 @@ subprojects {
             untilBuild customUntilBuild
         }
 
-        changeNotes({ changelog.getUnreleased().toHTML() })
+        changeNotes changelog.getUnreleased().toHTML()
         pluginDescription htmlFixer("${project.projectDir}/src/main/resources/META-INF/description.html")
     }
 
diff --git a/lang-fluid/build.gradle b/lang-fluid/build.gradle
@@ -33,6 +33,11 @@ intellij {
     ]
 }
 
+publishPlugin {
+    channels ["nightly"]
+    token System.getenv('PUBLISH_TOKEN')
+}
+
 task generateFluidLexer(type: GenerateLexer) {
     source = "src/main/grammars/FluidLexer.flex"
     targetDir = "gen/com/cedricziel/idea/fluid/lang/lexer"
diff --git a/lang-typoscript/build.gradle b/lang-typoscript/build.gradle
@@ -34,6 +34,11 @@ intellij {
     ]
 }
 
+publishPlugin {
+    channels ["nightly"]
+    token System.getenv('PUBLISH_TOKEN')
+}
+
 task generateTypoScriptLexer(type: GenerateLexer) {
     source = "src/main/grammars/TypoScriptLexer.flex"
     targetDir = "gen/com/cedricziel/idea/typoscript/lang/lexer"
diff --git a/typo3-cms/build.gradle b/typo3-cms/build.gradle
@@ -19,6 +19,11 @@ intellij {
     plugins = requiredPlugins
 }
 
+publishPlugin {
+    channels ["default"]
+    token System.getenv('PUBLISH_TOKEN')
+}
+
 sourceSets {
     main.resources.srcDirs += [ "src/main/java" ]
     test {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,11 @@ intellij {`
`33`	`33`	`]`
`34`	`34`	`}`
`35`	`35`
	`36`	`+publishPlugin {`
	`37`	`+ channels ["nightly"]`
	`38`	`+ token System.getenv('PUBLISH_TOKEN')`
	`39`	`+}`
	`40`	`+`
`36`	`41`	`task generateFluidLexer(type: GenerateLexer) {`
`37`	`42`	`source = "src/main/grammars/FluidLexer.flex"`
`38`	`43`	`targetDir = "gen/com/cedricziel/idea/fluid/lang/lexer"`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,11 @@ intellij {`
`34`	`34`	`]`
`35`	`35`	`}`
`36`	`36`
	`37`	`+publishPlugin {`
	`38`	`+ channels ["nightly"]`
	`39`	`+ token System.getenv('PUBLISH_TOKEN')`
	`40`	`+}`
	`41`	`+`
`37`	`42`	`task generateTypoScriptLexer(type: GenerateLexer) {`
`38`	`43`	`source = "src/main/grammars/TypoScriptLexer.flex"`
`39`	`44`	`targetDir = "gen/com/cedricziel/idea/typoscript/lang/lexer"`