From a76013f031b43cf53082a0a13c1238bf36be42ef Mon Sep 17 00:00:00 2001 From: KevIsDev Date: Mon, 12 May 2025 02:17:11 +0100 Subject: [PATCH 1/2] ci: reorder steps and add env vars for Electron build #release:major --- .github/workflows/update-stable.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index 5c0ddef3..8488d0f5 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -122,6 +122,10 @@ jobs: sudo apt-get install -y rpm - name: Build Electron app + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + NODE_OPTIONS: "--max_old_space_size=4096" run: | if [ "$RUNNER_OS" == "Windows" ]; then pnpm run electron:build:win @@ -131,6 +135,15 @@ jobs: pnpm run electron:build:linux fi + - name: Commit and Tag Release + run: | + git pull + git add package.json pnpm-lock.yaml changelog.md + git commit -m "chore: release version ${{ steps.bump_version.outputs.new_version }}" + git tag "v${{ steps.bump_version.outputs.new_version }}" + git push + git push --tags + - name: Upload Electron Build as Release Assets uses: softprops/action-gh-release@v2 with: @@ -145,16 +158,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Commit and Tag Release - - name: Commit and Tag Release - run: | - git pull - git add package.json pnpm-lock.yaml changelog.md - git commit -m "chore: release version ${{ steps.bump_version.outputs.new_version }}" - git tag "v${{ steps.bump_version.outputs.new_version }}" - git push - git push --tags - - name: Update Stable Branch run: | if ! git checkout stable 2>/dev/null; then From 553fa5d1381c48729b16580394a53414fb66292e Mon Sep 17 00:00:00 2001 From: KevIsDev Date: Mon, 12 May 2025 02:43:08 +0100 Subject: [PATCH 2/2] fix: revert back to previous commit --- .github/workflows/update-stable.yml | 57 +---------------------------- app/components/ui/FileIcon.tsx | 14 +++---- changelog.md | 2 +- 3 files changed, 10 insertions(+), 63 deletions(-) diff --git a/.github/workflows/update-stable.yml b/.github/workflows/update-stable.yml index 8488d0f5..f990968a 100644 --- a/.github/workflows/update-stable.yml +++ b/.github/workflows/update-stable.yml @@ -88,6 +88,7 @@ jobs: env: NEW_VERSION: ${{ steps.bump_version.outputs.new_version }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: .github/scripts/generate-changelog.sh - name: Get the latest commit hash and version tag @@ -95,46 +96,6 @@ jobs: echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $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 - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - NODE_OPTIONS: "--max_old_space_size=4096" - 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: Commit and Tag Release run: | git pull @@ -144,20 +105,6 @@ jobs: git push git push --tags - - 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 }} - - name: Update Stable Branch run: | if ! git checkout stable 2>/dev/null; then @@ -177,4 +124,4 @@ jobs: gh release create "$VERSION" \ --title "Release $VERSION" \ --notes-file release_notes.md \ - --target stable \ No newline at end of file + --target stable diff --git a/app/components/ui/FileIcon.tsx b/app/components/ui/FileIcon.tsx index 00d96715..05f69796 100644 --- a/app/components/ui/FileIcon.tsx +++ b/app/components/ui/FileIcon.tsx @@ -39,11 +39,11 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) { } if (['java', 'class', 'jar'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-java'; } if (['php'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-php'; } if (['rb', 'ruby'].includes(extension)) { @@ -63,15 +63,15 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) { } if (['swift'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-swift'; } if (['kt', 'kotlin'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-kotlin'; } if (['dart'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-dart'; } // Config files @@ -80,7 +80,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) { } if (['xml', 'svg'].includes(extension)) { - return 'i-ph:file-code'; + return 'i-ph:file-xml'; } if (['toml'].includes(extension)) { @@ -157,7 +157,7 @@ export function FileIcon({ filename, size = 'md', className }: FileIconProps) { } if (filename.startsWith('Dockerfile')) { - return 'i-ph:file-code'; + return 'i-ph:docker-logo'; } // Default diff --git a/changelog.md b/changelog.md index 42c9211a..462b88a5 100644 --- a/changelog.md +++ b/changelog.md @@ -69,4 +69,4 @@ A huge thank you to our amazing new contributors! Your first contribution marks ## 📈 Stats -**Full Changelog**: [`v0.0.6..v0.0.7`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.6...v0.0.7) \ No newline at end of file +**Full Changelog**: [`v0.0.6..v0.0.7`](https://github.com/stackblitz-labs/bolt.diy/compare/v0.0.6...v0.0.7)