Merge branch 'main' into alexr00/required-marlin

Author: alexr00

.fantasticonrc.js

@@ -1,14 +1,25 @@
 /* eslint-disable */
 var pkg = require('./package.json');
 var path = require('path');
-var codepoints = require('./src/template/mapping.json');
+var mapping = require('./src/template/mapping.json');
 
 // Ensure paths are platform-agnostic for Windows CI
 var inputDir = path.resolve(__dirname, 'src', 'icons');
 var outputDir = path.resolve(__dirname, 'dist');
 var templateHtml = path.resolve(__dirname, 'src', 'template', 'preview.hbs');
 var templateCss = path.resolve(__dirname, 'src', 'template', 'styles.hbs');
 
+// Convert new mapping format back to alias -> code format for fantasticon
+// New format: { "code": ["alias1", "alias2", ...] }
+// Fantasticon expects: { "alias1": code, "alias2": code, ... }
+var codepoints = {};
+Object.entries(mapping).forEach(function([code, aliases]) {
+    var codeNum = parseInt(code);
+    aliases.forEach(function(alias) {
+        codepoints[alias] = codeNum;
+    });
+});
+
 module.exports = {
     name: 'codicon',
     prefix: 'codicon',

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
           name: codicon-font-${{ github.sha }}.ttf
           path: dist/codicon.ttf
 
-      - name: PR to microsoft/vscode # TODO: Separate "deploy:" step?
+      - name: PR to microsoft/vscode
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
@@ -42,23 +42,26 @@ jobs:
           cd vscode
           git checkout -b $BRANCH
 
-          cp ../dist/codicon.ttf src/vs/base/browser/ui/codicons/codicon/
-          cp ../dist/codiconsLibrary.ts src/vs/base/common/
+          cp -f ../dist/codicon.ttf src/vs/base/browser/ui/codicons/codicon/
+          cp -f ../dist/codiconsLibrary.ts src/vs/base/common/
           git add .
 
           git config user.name "${{ github.actor }}"
           git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
-          git commit -m "$MESSAGE"
 
-# TODO: This doesn't work yet due to permissions
-#
-#          git push -f origin $BRANCH
+          if git diff-index --quiet HEAD --; then
+            echo "No changes to commit"
+            exit 0
+          fi
+
+          git commit -m "$MESSAGE"
+          git push -f https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/microsoft/vscode.git $BRANCH
 
-#          echo "${{ secrets.ACCESS_TOKEN }}" > token.txt
-#          gh auth login --with-token < token.txt
+          echo "${{ secrets.GITHUB_TOKEN }}" > token.txt
+          gh auth login --with-token < token.txt
 
-#          gh pr create \
-#            --title "$MESSAGE" \
-#            --body "" \
-#            --base "main" \
-#            --head "$BRANCH"
+          gh pr create \
+            --title "[Codicon bump] $MESSAGE" \
+            --body "This PR was created automatically from [vscode-codicons](https://github.com/microsoft/vscode-codicons)" \
+            --base "main" \
+            --head "$BRANCH"