Merge pull request #1023 from adobe/develop

v3.4.2 release
adobe · Oct 26, 2023 · 3fe78aa · 3fe78aa
2 parents 3dbd89f + 4fa0d65
commit 3fe78aa
Show file tree

Hide file tree

Showing 18 changed files with 1,081 additions and 1,108 deletions.
diff --git a/.github/.release-changelog-config.json b/.github/.release-changelog-config.json
@@ -0,0 +1,50 @@
+{
+  "categories": [
+    {
+      "title": "### 💥 Breaking",
+      "labels": ["breaking"]
+    },
+    {
+      "title": "### 🚀 Enhancements",
+      "labels": ["enhancement"]
+    },
+    {
+      "title": "### 🐛 Bug fixes",
+      "labels": ["bug"]
+    },
+    {
+      "title": "### 🛡️ Security",
+      "labels": ["security"]
+    },
+    {
+      "title": "### ✅ Testing",
+      "labels": ["tests"]
+    },
+    {
+      "title": "### 📖 Documentation",
+      "labels": ["documentation"]
+    },
+    {
+      "title": "### 📦 Uncategorized",
+      "labels": []
+    }
+  ],
+  "sort": {
+    "order": "DESC",
+    "on_property": "mergedAt"
+  },
+  "template": "## [${{TO_TAG}}](https://github.com/adobe/asset-share-commons/tree/${{TO_TAG}})\n\n[Full Changelog](https://github.com/adobe/asset-share-commons/compare/${{FROM_TAG}}...${{TO_TAG}})\n\n${{CHANGELOG}}",
+  "pr_template": "- ${{TITLE}} [#${{NUMBER}}](${{URL}}) (${{AUTHOR}})",
+  "tag_resolver": {
+    "method": "semver",
+    "filter": {
+      "pattern": "asset-share-commons-(.+)",
+      "flags": "gu"
+    },
+    "transformer": {
+      "pattern": "asset-share-commons-(.+)",
+      "flags": "gu",
+      "target": "$1"
+    }
+  }
+}
diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       # Check out Git repository
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Set up environment with Java and Maven
       - name: Setup JDK
@@ -71,9 +71,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Work around for https://github.com/heinrichreimer/action-github-changelog-generator/issues/21
+          fetch-depth: 0
           ref: asset-share-commons-${{ needs.Tag.outputs.version }}
 
       - name: Setup JDK
@@ -88,25 +88,11 @@ jobs:
 
       - name: Generate Release Changelog
         id: generate-release-changelog
-        uses: heinrichreimer/github-changelog-generator-action@v2.3
+        uses: mikepenz/release-changelog-builder-action@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          breakingLabel: '### 💥 Breaking'
-          enhancementLabel: '### 🚀 Enhancements'
-          bugsLabel: '### 🐛 Bug fixes'
-          securityLabel: '### 🛡️ Security'
-          issuesLabel: '### 📁 Other issues'
-          prLabel: '### 📁 Other pull requests'
-          addSections: '{"documentation":{"prefix":"### 📖 Documentation","labels":["documentation"]},"tests":{"prefix":"### ✅ Testing","labels":["tests"]}}'
-          issues: false
-          issuesWoLabels: false
-          pullRequests: true
-          prWoLabels: true
-          author: true
-          compareLink: true
-          onlyLastTag: true
-          stripHeaders: true
-          stripGeneratorNotice: true
+          configuration: ".github/.release-changelog-config.json"
+          toTag: asset-share-commons-${{ needs.Tag.outputs.version }}
 
       - name: Create Release
         id: create-release
@@ -138,7 +124,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: asset-share-commons-${{ needs.Tag.outputs.version }}
 
@@ -178,9 +164,38 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
   Changelog:
+    runs-on: ubuntu-latest
     needs: Tag
     if: ${{ !inputs.dryRun }}
-    uses: ./.github/workflows/changelog.yaml
+    steps:
+      - name: "Checkout"
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          ref: main
+
+      - name: "Build Changelog Fragment"
+        id: build_changelog_fragment
+        uses: mikepenz/release-changelog-builder-action@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          configuration: ".github/.release-changelog-config.json"
+          toTag: asset-share-commons-${{ needs.Tag.outputs.version }}
+
+      - name: "Build Changelog"
+        run: |
+          echo -e "${{steps.build_changelog_fragment.outputs.changelog}}" | cat - CHANGELOG_HISTORY.md > tmp
+          mv tmp CHANGELOG_HISTORY.md
+          echo -e '# 📑 Changelog\n\n' | cat - CHANGELOG_HISTORY.md > CHANGELOG.md
+
+      - name: Commit Changelog
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email [email protected]
+          git add CHANGELOG.md
+          git add CHANGELOG_HISTORY.md
+          git commit -m 'Update Changelog.'
+          git push
 
   Sync_develop:
     needs: Changelog

diff --git a/.github/workflows/snapshot-deploy.yaml b/.github/workflows/snapshot-deploy.yaml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Import GPG key
         env:

diff --git a/.github/workflows/sync-develop.yaml b/.github/workflows/sync-develop.yaml
@@ -29,7 +29,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: 'develop'

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
         uses: actions/setup-java@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,19 @@
 # 📑 Changelog
 
-## [Unreleased](https://github.com/adobe/asset-share-commons/tree/HEAD)
+## [asset-share-commons-3.4.0](https://github.com/adobe/asset-share-commons/tree/asset-share-commons-3.4.0)
 
-[Full Changelog](https://github.com/adobe/asset-share-commons/compare/asset-share-commons-3.4.0...HEAD)
+[Full Changelog](https://github.com/adobe/asset-share-commons/compare/asset-share-commons-3.3.0...asset-share-commons-3.4.0)
 
 ### 🐛 Bug fixes
 
-- Fixed issue with default values filter values \(active options\) not im… [\#977](https://github.com/adobe/asset-share-commons/pull/977) ([davidjgonzalez](https://github.com/davidjgonzalez))
-
-### 📁 Other pull requests
+- Fixed issue with default values filter values (active options) not im… [#977](https://github.com/adobe/asset-share-commons/pull/977) (davidjgonzalez)
 
-- Bump org.apache.maven.plugins:maven-clean-plugin from 3.2.0 to 3.3.1 [\#979](https://github.com/adobe/asset-share-commons/pull/979) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Upgraded moment.js to 2.29.4 [\#978](https://github.com/adobe/asset-share-commons/pull/978) ([davidjgonzalez](https://github.com/davidjgonzalez))
-- Bump maven-checkstyle-plugin from 3.2.2 to 3.3.0 [\#963](https://github.com/adobe/asset-share-commons/pull/963) ([dependabot[bot]](https://github.com/apps/dependabot))
+### 📦 Uncategorized
 
-## [asset-share-commons-3.4.0](https://github.com/adobe/asset-share-commons/tree/asset-share-commons-3.4.0) (2023-08-07)
-
-[Full Changelog](https://github.com/adobe/asset-share-commons/compare/asset-share-commons-3.3.0...asset-share-commons-3.4.0)
+- v3.3.2 [#980](https://github.com/adobe/asset-share-commons/pull/980) (davidjgonzalez)
+- Upgraded moment.js to 2.29.4 [#978](https://github.com/adobe/asset-share-commons/pull/978) (davidjgonzalez)
+- Bump org.apache.maven.plugins:maven-clean-plugin from 3.2.0 to 3.3.1 [#979](https://github.com/adobe/asset-share-commons/pull/979) (dependabot[bot])
+- Bump maven-checkstyle-plugin from 3.2.2 to 3.3.0 [#963](https://github.com/adobe/asset-share-commons/pull/963) (dependabot[bot])
 
 ## [asset-share-commons-3.3.0](https://github.com/adobe/asset-share-commons/tree/asset-share-commons-3.3.0) (2023-07-24)