From e0ab9f869700cf79c2277ccea9c365613829e393 Mon Sep 17 00:00:00 2001 From: jon gadsden Date: Thu, 21 Mar 2024 13:42:19 +0000 Subject: [PATCH 1/3] fix up sed commands for release pipeline --- .github/workflows/release.yaml | 20 ++++++++++---------- _includes/banner.html | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2578b0bd..cd13242c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -25,15 +25,15 @@ jobs: - name: Fix up markdown run: | pwd - find release -name "*.md" -exec sed -i '' "s|permalink: /draft/|permalink: /release/|" {} + - find release -name "*.md" -exec sed -i '' "/The OWASP Developer Guide is a community effort/d" {} + - find release -name "*.md" -exec sed -i '' "/edit on GitHub/d" {} + - find release -name "*.md" -exec sed -i '' "/www-project-developer-guide\/issues\/new?labels/d" {} + - find release -name "*.md" -exec sed -i '' "/www-project-developer-guide\/blob\/main/d" {} + + find release -name "*.md" -exec sed -i "s|permalink: /draft/|permalink: /release/|" {} + + find release -name "*.md" -exec sed -i "/The OWASP Developer Guide is a community effort/d" {} + + find release -name "*.md" -exec sed -i "/edit on GitHub/d" {} + + find release -name "*.md" -exec sed -i "/www-project-developer-guide\/issues\/new?labels/d" {} + + find release -name "*.md" -exec sed -i "/www-project-developer-guide\/blob\/main/d" {} + find release -name "*.md" -exec \ - sed -i '' "s/.*the latest contributions to the Developer Guide.*/\#\#\# Release version $GITHUB_REF_NAME/" {} + - find release -name "*.md" -exec sed -i '' "s/ (Draft)//gI" {} + - find release -name "*.md" -exec sed -i '' "/order: / s/$/0/" {} + + sed -i "s/.*the latest contributions to the Developer Guide.*/\#\#\# Release version $GITHUB_REF_NAME/" {} + + find release -name "*.md" -exec sed -i "s/ (Draft)//gI" {} + + find release -name "*.md" -exec sed -i "/order: / s/$/0/" {} + - name: Combine markdown run: | @@ -73,11 +73,11 @@ jobs: - name: Remove newpage tags run: | - find release -name "*.md" -exec sed -i '' "/newpage/d" {} + + find release -name "*.md" -exec sed -i "/newpage/d" {} + - name: Remove multiple blank lines run: | - find release -name "*.md" -exec sed -i '' ':a; /^\n*$/{ s/\n//; N; ba};' {} + + find release -name "*.md" -exec sed -i ":a; /^\n*$/{ s/\n//; N; ba};" {} + - name: Create pull request uses: peter-evans/create-pull-request@v6.0.2 diff --git a/_includes/banner.html b/_includes/banner.html index b1d8bd41..584e421e 100644 --- a/_includes/banner.html +++ b/_includes/banner.html @@ -7,7 +7,7 @@ {% if page.url contains "/release/" %}
- You're viewing the latest Developer Guide + The latest released version of the Developer Guide
{% endif %} From b460a6086736f02498630e63d069e8c964cf55aa Mon Sep 17 00:00:00 2001 From: jon gadsden Date: Thu, 21 Mar 2024 14:07:30 +0000 Subject: [PATCH 2/3] remove final blank line --- .github/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cd13242c..5996fedd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -78,6 +78,7 @@ jobs: - name: Remove multiple blank lines run: | find release -name "*.md" -exec sed -i ":a; /^\n*$/{ s/\n//; N; ba};" {} + + find release -name "*.md" -exec sed -i "${/^$/d;}" {} + - name: Create pull request uses: peter-evans/create-pull-request@v6.0.2 From fce649416ff4407f05d1f59c1751560e2e40381c Mon Sep 17 00:00:00 2001 From: jon gadsden Date: Thu, 21 Mar 2024 17:50:42 +0000 Subject: [PATCH 3/3] auto pull-request description updated --- .github/workflows/release.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5996fedd..ce2ed947 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -73,21 +73,24 @@ jobs: - name: Remove newpage tags run: | - find release -name "*.md" -exec sed -i "/newpage/d" {} + + find release -name "*.md" -exec sed -i '/newpage/d' {} + - name: Remove multiple blank lines run: | - find release -name "*.md" -exec sed -i ":a; /^\n*$/{ s/\n//; N; ba};" {} + - find release -name "*.md" -exec sed -i "${/^$/d;}" {} + + find release -name "*.md" -exec sed -i ':a; /^\n*$/{ s/\n//; N; ba};' {} + + find release -name "*.md" -exec sed -i '${/^$/d;}' {} + - name: Create pull request uses: peter-evans/create-pull-request@v6.0.2 with: - title: 'Release for version $GITHUB_REF_NAME' + title: "Release for version $GITHUB_REF_NAME" body: | - ### Automatically generated for version $GITHUB_REF_NAME - --- - Please verify and then **Merge** the pull request to update the release + **Summary** : + Pull request automatically generated for the latest release version + **Description for the changelog** : + Developer Guide release + **Other info** : + Please verify and then merge the pull request to update the release commit-message: 'update release' branch: update-release base: main