Merge branch 'main' into stable

This commit is contained in:
KevIsDev 2025-05-12 02:45:27 +01:00
commit c1474d85e5
3 changed files with 10 additions and 60 deletions

View File

@ -88,6 +88,7 @@ jobs:
env: env:
NEW_VERSION: ${{ steps.bump_version.outputs.new_version }} NEW_VERSION: ${{ steps.bump_version.outputs.new_version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: .github/scripts/generate-changelog.sh run: .github/scripts/generate-changelog.sh
- name: Get the latest commit hash and version tag - name: Get the latest commit hash and version tag
@ -95,57 +96,6 @@ jobs:
echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV
echo "NEW_VERSION=${{ steps.bump_version.outputs.new_version }}" >> $GITHUB_ENV echo "NEW_VERSION=${{ steps.bump_version.outputs.new_version }}" >> $GITHUB_ENV
# Electron Build Process (added)
- name: Checkout Electron App
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup Node.js and pnpm for Electron
uses: actions/setup-node@v4
with:
node-version: '18'
- name: Install pnpm for Electron
uses: pnpm/action-setup@v2
with:
version: latest
run_install: true
- name: Install Dependencies for Electron
run: pnpm install
- name: Install Linux dependencies for Electron
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install -y rpm
- name: Build Electron app
run: |
if [ "$RUNNER_OS" == "Windows" ]; then
pnpm run electron:build:win
elif [ "$RUNNER_OS" == "macOS" ]; then
pnpm run electron:build:mac
else
pnpm run electron:build:linux
fi
- name: Upload Electron Build as Release Assets
uses: softprops/action-gh-release@v2
with:
tag_name: v${{ steps.bump_version.outputs.new_version }}
name: "Electron Release v${{ steps.bump_version.outputs.new_version }}"
files: |
dist/*.exe
dist/*.dmg
dist/*.deb
dist/*.AppImage
dist/*.zip
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# Commit and Tag Release
- name: Commit and Tag Release - name: Commit and Tag Release
run: | run: |
git pull git pull

View File

@ -39,11 +39,11 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
} }
if (['java', 'class', 'jar'].includes(extension)) { if (['java', 'class', 'jar'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-java';
} }
if (['php'].includes(extension)) { if (['php'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-php';
} }
if (['rb', 'ruby'].includes(extension)) { if (['rb', 'ruby'].includes(extension)) {
@ -63,15 +63,15 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
} }
if (['swift'].includes(extension)) { if (['swift'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-swift';
} }
if (['kt', 'kotlin'].includes(extension)) { if (['kt', 'kotlin'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-kotlin';
} }
if (['dart'].includes(extension)) { if (['dart'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-dart';
} }
// Config files // Config files
@ -80,7 +80,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
} }
if (['xml', 'svg'].includes(extension)) { if (['xml', 'svg'].includes(extension)) {
return 'i-ph:file-code'; return 'i-ph:file-xml';
} }
if (['toml'].includes(extension)) { if (['toml'].includes(extension)) {
@ -157,7 +157,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) {
} }
if (filename.startsWith('Dockerfile')) { if (filename.startsWith('Dockerfile')) {
return 'i-ph:file-code'; return 'i-ph:docker-logo';
} }
// Default // Default