Skip to content

Commit 4354ad4

Browse files
committed
git push origin mainRevert "fix: fix icon classes for consistency and clarity #release:major"
This reverts commit 870828d.
1 parent e6fd901 commit 4354ad4

File tree

3 files changed

+23
-64
lines changed

3 files changed

+23
-64
lines changed

.github/workflows/update-stable.yml

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
prepare-release:
1313
if: contains(github.event.head_commit.message, '#release')
1414
runs-on: ubuntu-latest
15-
outputs:
16-
new_version: ${{ steps.bump_version.outputs.new_version }}
1715

1816
steps:
1917
- uses: actions/checkout@v4
@@ -90,8 +88,14 @@ jobs:
9088
env:
9189
NEW_VERSION: ${{ steps.bump_version.outputs.new_version }}
9290
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91+
9392
run: .github/scripts/generate-changelog.sh
9493

94+
- name: Get the latest commit hash and version tag
95+
run: |
96+
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
97+
echo "NEW_VERSION=${{ steps.bump_version.outputs.new_version }}" >> $GITHUB_ENV
98+
9599
- name: Commit and Tag Release
96100
run: |
97101
git pull
@@ -110,59 +114,14 @@ jobs:
110114
git merge main --no-ff -m "chore: release version ${{ steps.bump_version.outputs.new_version }}"
111115
git push --set-upstream origin stable --force
112116
113-
build-electron:
114-
needs: prepare-release
115-
runs-on: ${{ matrix.os }}
116-
strategy:
117-
matrix:
118-
os: [ubuntu-latest, windows-latest, macos-latest]
119-
node-version: [18.18.0]
120-
fail-fast: false
121-
122-
steps:
123-
- uses: actions/checkout@v4
124-
125-
- uses: actions/setup-node@v4
126-
with:
127-
node-version: ${{ matrix.node-version }}
128-
129-
- uses: pnpm/action-setup@v2
130-
with:
131-
version: 9.14.4
132-
run_install: false
133-
134-
- name: Install dependencies
135-
run: pnpm install
136-
137-
- name: Install Linux dependencies
138-
if: matrix.os == 'ubuntu-latest'
139-
run: |
140-
sudo apt-get update
141-
sudo apt-get install -y rpm
142-
143-
- name: Build Electron app
117+
- name: Create GitHub Release
144118
env:
145-
NODE_OPTIONS: "--max_old_space_size=4096"
146119
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
147120
run: |
148-
if [ "$RUNNER_OS" == "Windows" ]; then
149-
pnpm run electron:build:win
150-
elif [ "$RUNNER_OS" == "macOS" ]; then
151-
pnpm run electron:build:mac
152-
else
153-
pnpm run electron:build:linux
154-
fi
155-
shell: bash
156-
157-
- name: Upload Release Assets
158-
uses: softprops/action-gh-release@v2
159-
with:
160-
tag_name: v${{ needs.prepare-release.outputs.new_version }}
161-
files: |
162-
dist/*.exe
163-
dist/*.dmg
164-
dist/*.deb
165-
dist/*.AppImage
166-
dist/*.zip
167-
env:
168-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
121+
VERSION="v${{ steps.bump_version.outputs.new_version }}"
122+
# Save changelog to a file
123+
echo "${{ steps.changelog.outputs.content }}" > release_notes.md
124+
gh release create "$VERSION" \
125+
--title "Release $VERSION" \
126+
--notes-file release_notes.md \
127+
--target stable

app/components/@settings/tabs/data/DataTab.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ export function DataTab() {
514514
<CardHeader>
515515
<div className="flex items-center mb-2">
516516
<motion.div className="text-accent-500 mr-2" whileHover={{ scale: 1.1 }} whileTap={{ scale: 0.9 }}>
517-
<div className="i-ph-download-simple w-5 h-5" />
517+
<div className="i-ph-filter-duotone w-5 h-5" />
518518
</motion.div>
519519
<CardTitle className="text-lg group-hover:text-bolt-elements-item-contentAccent transition-colors">
520520
Export Selected Settings
@@ -592,7 +592,7 @@ export function DataTab() {
592592
whileHover={{ scale: 1.1 }}
593593
whileTap={{ scale: 0.9 }}
594594
>
595-
<div className="i-ph-arrow-counter-clockwise w-5 h-5" />
595+
<div className="i-ph-arrow-counter-clockwise-duotone w-5 h-5" />
596596
</motion.div>
597597
<CardTitle className="text-lg group-hover:text-bolt-elements-item-contentAccent transition-colors">
598598
Reset All Settings

app/components/ui/FileIcon.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
3939
}
4040

4141
if (['java', 'class', 'jar'].includes(extension)) {
42-
return 'i-ph:file-js';
42+
return 'i-ph:file-java';
4343
}
4444

4545
if (['php'].includes(extension)) {
46-
return 'i-ph:file-py';
46+
return 'i-ph:file-php';
4747
}
4848

4949
if (['rb', 'ruby'].includes(extension)) {
@@ -63,15 +63,15 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
6363
}
6464

6565
if (['swift'].includes(extension)) {
66-
return 'i-ph:file-code';
66+
return 'i-ph:file-swift';
6767
}
6868

6969
if (['kt', 'kotlin'].includes(extension)) {
70-
return 'i-ph:file-code';
70+
return 'i-ph:file-kotlin';
7171
}
7272

7373
if (['dart'].includes(extension)) {
74-
return 'i-ph:file-code';
74+
return 'i-ph:file-dart';
7575
}
7676

7777
// Config files
@@ -80,7 +80,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
8080
}
8181

8282
if (['xml', 'svg'].includes(extension)) {
83-
return 'i-ph:file-code';
83+
return 'i-ph:file-xml';
8484
}
8585

8686
if (['toml'].includes(extension)) {
@@ -157,7 +157,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
157157
}
158158

159159
if (filename.startsWith('Dockerfile')) {
160-
return 'i-ph:file-code';
160+
return 'i-ph:docker-logo';
161161
}
162162

163163
// Default

0 commit comments

Comments
 (0)