Improve release workflow (#1378)

* Filter out release commits

* Fix compare link

* Adjust preview script for folder icons

* Update release workflow

* Update release commit message

Should be the same commit messages as used before

* Use changelog machine to generate changelog for release

* Update dependency

* Update build script

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
         shell: bash
         if: ${{ success() && matrix.os == 'ubuntu-latest' }}
       - name: Install node_modules 📦
-        run: npm install
+        run: npm ci
       - name: Cache node_modules 💾
         uses: actions/cache@v2
         env:

.github/workflows/release.yml

@@ -28,37 +28,41 @@ jobs:
           node-version: 'lts/*'
       - name: Install node_modules 📦
         run: |
-          npm install
+          npm ci
           npm install --global vsce
       - name: Update version ↗
         run: |
           git config --global user.name 'Philipp Kief'
           git config --global user.email 'PKief@users.noreply.github.com'
           git config --global push.followTags true
-          npm version ${{ env.VERSION_CHANGE }}
-      - name: Get version 🔍
+          npm version ${{ env.VERSION_CHANGE }} -m "Release %s"
+      - name: Get meta data 🔍
         run: |
           NODE_VERSION=$(node -p -e "require('./package.json').version")
           echo VERSION=$NODE_VERSION >> $GITHUB_ENV
+          NODE_NAME=$(node -p -e "require('./package.json').name")
+          echo NAME=$NODE_NAME >> $GITHUB_ENV
+          NODE_DISPLAY_NAME=$(node -p -e "require('./package.json').displayName")
+          echo DISPLAY_NAME=$NODE_DISPLAY_NAME >> $GITHUB_ENV
       - name: Build ⚒️
         run: vsce package
       - name: Push tags 📌
         run: git push
       - name: Release ${{ env.VERSION }} 🔆
         uses: softprops/action-gh-release@v1
         with:
-          files: material-icon-theme-${{ env.VERSION }}.vsix
+          files: ${{ env.NAME }}-${{ env.VERSION }}.vsix
           tag_name: v${{ env.VERSION }}
-          name: Material Icon Theme v${{ env.VERSION }}
+          name: ${{ env.DISPLAY_NAME }} v${{ env.VERSION }}
           generate_release_notes: true
       - name: Publish to Open VSX Registry 🌐
         uses: HaaLeo/publish-vscode-extension@v1
         with:
           pat: ${{ secrets.OPEN_VSX_TOKEN }}
-          extensionFile: material-icon-theme-${{ env.VERSION }}.vsix
+          extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix
       - name: Publish to Visual Studio Marketplace 🌐
         uses: HaaLeo/publish-vscode-extension@v1
         with:
           pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
           registryUrl: https://marketplace.visualstudio.com
-          extensionFile: material-icon-theme-${{ env.VERSION }}.vsix
+          extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix

changelog.config.json

@@ -0,0 +1,4 @@
+{
+  "repositoryUrl": "https://github.com/PKief/vscode-material-icon-theme",
+  "blacklistPattern": "^Release \\d+\\.\\d+\\.\\d+|^\\d+\\.\\d+\\.\\d+$"
+}

package.json

@@ -20,7 +20,7 @@
     "preview": "ts-node ./src/scripts/preview",
     "svgo": "svgo -i icons -o icons -q",
     "test": "node ./out/test/runTest.js",
-    "changelog": "ts-node ./src/scripts/changelog/index",
+    "changelog": "changelog-machine --config changelog.config.json",
     "preversion": "npm run contributors && git add images/contributors.png && npm run preview && git add images/fileIcons.png && git add images/folderIcons.png",
     "version": "npm run changelog && git add CHANGELOG.md",
     "vscode:prepublish": "npm run lint && npm run compile && npm run package-web"
@@ -238,6 +238,7 @@
     "@types/vscode": "~1.51.0",
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
+    "changelog-machine": "^1.0.0",
     "eslint": "^8.3.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",

src/scripts/preview/index.ts

@@ -18,9 +18,6 @@ const folderThemes = filterDuplicates(
   folderIcons
     .map((theme) => {
       const folders = [];
-      if (theme.defaultIcon.name !== '') {
-        folders.push(theme.defaultIcon.name);
-      }
       if (theme.icons && theme.icons.length > 0) {
         folders.push(...theme.icons.map((i) => i.name));
       }