clean up CI

Author: shaunsingh

.github/workflows/deploy.yml

@@ -106,9 +106,6 @@ jobs:
         run: |
           set -euo pipefail
           make all zed textmate xcode sublime-ui
-          mkdir -p out
-          rm -f out/sublime-ui.zip
-          (cd assets/sublime-ui && zip -q -r ../../out/sublime-ui.zip *.sublime-theme)
 
       - name: Upload themes artifacts
         uses: actions/upload-artifact@v4
@@ -121,7 +118,7 @@ jobs:
             intellij/**/*.icls
             xcode/**/*.xccolortheme
             zed/oxocarbon.json
-            out/sublime-ui.zip
+            sublime-ui/
 
   visualstudio:
     name: Build Visual Studio Theme
@@ -253,7 +250,7 @@ jobs:
           dist/unix-themes/textmate|textmate
           dist/unix-themes/zed|zed
           dist/unix-themes/xcode|xcode
-          out/sublime-ui.zip|sublime-ui
+          dist/unix-themes/sublime-ui|sublime-ui
           dist/visualstudio|visualstudio
           EOF
 
@@ -297,6 +294,8 @@ jobs:
               echo '  - Copy the `.tmTheme` files to `~/Library/Application Support/Sublime Text/Packages/User`'
               echo "  - Then select it via Preferences > Color Scheme"
               echo "- Unzip the Sublime UI archive."
+              echo '- Copy the `.tmTheme` files to `~/Library/Application Support/Sublime Text/Packages/User`'
+              echo "  - Then select color scheme via Preferences > Color Scheme"
               echo '- Copy the `.sublime-theme` files to `~/Library/Application Support/Sublime Text/Packages/User`'
               echo '- Select the theme via Preferences > Select Theme'
               echo

.gitignore

@@ -8,6 +8,7 @@ node_modules
 # handled by CI/CD
 *.vsix
 /intellij
+/sublime-ui
 /textmate
 /visualstudio
 /zed

Makefile

@@ -18,7 +18,7 @@ TMDIR := textmate
 TM_CONVERTER := target/release/json2tm
 TM_USER := ~/Library/Application\ Support/TextMate/Themes
 SUBLIME_USER := ~/Library/Application\ Support/Sublime\ Text/Packages/User
-SUBLIME_UI := $(ASSETS)/sublime-ui
+SUBLIME_UI_DIR := sublime-ui
 JSON2ST := target/release/json2st
 
 JSON2ST_SRCS := $(shell find json2st/src -type f -name '*.rs')
@@ -188,10 +188,10 @@ $(TMDIR)/%.tmTheme: $(THEMESDIR)/%.json $(TM_CONVERTER)
 	$(TM_CONVERTER) $< $@
 
 sublime-ui: $(SUBLIME_UI_INPUTS) $(JSON2ST)
-	@mkdir -p $(SUBLIME_UI)
+	@mkdir -p $(SUBLIME_UI_DIR)
 	@for pair in $(SUBLIME_UI_PAIRS); do \
 		in=$(THEMESDIR)/$${pair%%:*}; \
-		out=$(SUBLIME_UI)/$${pair##*:}; \
+		out=$(SUBLIME_UI_DIR)/$${pair##*:}; \
 		echo "$$in -> $$out"; \
 		if [ "$$(basename $$in)" = "PRINT.json" ]; then \
 			temp_in=$$(mktemp); \
@@ -271,7 +271,7 @@ install-sublime: textmate
 
 install-sublime-ui:
 	mkdir -p $(SUBLIME_USER)
-	cp $(SUBLIME_UI)/*.sublime-theme $(SUBLIME_USER)/
+	cp $(SUBLIME_UI_DIR)/*.sublime-theme $(SUBLIME_USER)/
 
 install-textmate: textmate
 	mkdir -p $(TM_USER)
@@ -282,7 +282,7 @@ install-xcode: xcode
 	cp $(XCODEDIR)/*.xccolortheme $(XCODE_USER)/
 
 clean:
-	cargo clean; rm -f $(OUTDIR)/*.json $(THEMESDIR)/*.json $(ZEDDIR)/*.json $(TMDIR)/*.tmTheme $(INTELLIJDIR)/*.icls $(SUBLIME_UI)/*.sublime-theme
+	cargo clean; rm -f $(OUTDIR)/*.json $(THEMESDIR)/*.json $(ZEDDIR)/*.json $(TMDIR)/*.tmTheme $(INTELLIJDIR)/*.icls $(SUBLIME_UI_DIR)/*.sublime-theme
 
 benchmark: build $(TM_CONVERTER) $(XCODE_CONVERTER) all
 	$(call bench,rm -f $(THEMESDIR)/*.json,make -s all)