Skip to content

Commit 0f29e0a

Browse files
committed
chore: migrate from pnpm to bun for dependency management in workflows and update README instructions
1 parent 0a08ce9 commit 0f29e0a

File tree

4 files changed

+40
-42
lines changed

4 files changed

+40
-42
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ jobs:
5656
save-if: "true"
5757
- uses: actions/cache@v4
5858
with:
59-
path: ~/.pnpm-store
60-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
59+
path: ~/.bun
60+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
6161
restore-keys: |
62-
${{ runner.os }}-pnpm-
63-
- run: npm install -g pnpm && pnpm install
62+
${{ runner.os }}-bun-
63+
- run: curl -fsSL https://bun.sh/install | bash && bun install
6464
- name: Import Apple Developer Certificate
6565
env:
6666
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -143,11 +143,11 @@ jobs:
143143
save-if: "true"
144144
- uses: actions/cache@v4
145145
with:
146-
path: ~/.pnpm-store
147-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
146+
path: ~/.bun
147+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
148148
restore-keys: |
149-
${{ runner.os }}-pnpm-
150-
- run: npm install -g pnpm && pnpm install
149+
${{ runner.os }}-bun-
150+
- run: curl -fsSL https://bun.sh/install | bash && bun install
151151
- uses: tauri-apps/tauri-action@v0
152152
env:
153153
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -199,16 +199,16 @@ jobs:
199199
save-if: "true"
200200
- uses: actions/cache@v4
201201
with:
202-
path: ~/.pnpm-store
203-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
202+
path: ~/.bun
203+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
204204
restore-keys: |
205-
${{ runner.os }}-pnpm-
205+
${{ runner.os }}-bun-
206206
- name: Install dependencies
207207
run: |
208208
sudo apt update
209209
sudo apt install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libayatana-appindicator3-dev librsvg2-dev libasound2-dev rpm
210210
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
211-
- run: npm install -g pnpm && pnpm install
211+
- run: curl -fsSL https://bun.sh/install | bash && bun install
212212
- uses: tauri-apps/tauri-action@v0
213213
env:
214214
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
save-if: "true"
5858
- uses: actions/cache@v4
5959
with:
60-
path: ~/.pnpm-store
61-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
60+
path: ~/.bun
61+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
6262
restore-keys: |
63-
${{ runner.os }}-pnpm-
64-
- run: npm install -g pnpm && pnpm install
63+
${{ runner.os }}-bun-
64+
- run: curl -fsSL https://bun.sh/install | bash && bun install
6565
- name: Import Apple Developer Certificate
6666
env:
6767
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
@@ -83,7 +83,7 @@ jobs:
8383
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
8484
with:
8585
args: ${{ matrix.args }}
86-
86+
8787
- name: Rename macOS Artifacts
8888
run: |
8989
mv src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/dmg/*.dmg src-tauri/target/${{ matrix.args == '--target aarch64-apple-darwin' && 'aarch64-apple-darwin' || 'x86_64-apple-darwin' }}/release/bundle/dmg/Qopy-${{ needs.prepare.outputs.version }}_${{ matrix.arch }}.dmg
@@ -125,11 +125,11 @@ jobs:
125125
save-if: "true"
126126
- uses: actions/cache@v4
127127
with:
128-
path: ~/.pnpm-store
129-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
128+
path: ~/.bun
129+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
130130
restore-keys: |
131-
${{ runner.os }}-pnpm-
132-
- run: npm install -g pnpm && pnpm install
131+
${{ runner.os }}-bun-
132+
- run: curl -fsSL https://bun.sh/install | bash && bun install
133133
- uses: tauri-apps/tauri-action@v0
134134
env:
135135
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -189,16 +189,16 @@ jobs:
189189
save-if: "true"
190190
- uses: actions/cache@v4
191191
with:
192-
path: ~/.pnpm-store
193-
key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
192+
path: ~/.bun
193+
key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
194194
restore-keys: |
195-
${{ runner.os }}-pnpm-
195+
${{ runner.os }}-bun-
196196
- name: Install dependencies
197197
run: |
198198
sudo apt update
199199
sudo apt install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libayatana-appindicator3-dev librsvg2-dev libasound2-dev rpm
200200
echo "PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV
201-
- run: npm install -g pnpm && pnpm install
201+
- run: curl -fsSL https://bun.sh/install | bash && bun install
202202
- name: Generate Changelog
203203
id: changelog
204204
run: |
@@ -243,21 +243,21 @@ jobs:
243243
id: release_body
244244
run: |
245245
VERSION="${{ needs.prepare.outputs.version }}"
246-
246+
247247
# Get the most recent release tag (v* tags only)
248248
LAST_TAG=$(git describe --match "v*" --abbrev=0 --tags `git rev-list --tags --skip=1 --max-count=1` 2>/dev/null || echo "")
249-
249+
250250
if [ -n "$LAST_TAG" ]; then
251251
echo "Debug: Found last release tag: $LAST_TAG"
252252
CHANGES=$(git log ${LAST_TAG}..HEAD --pretty=format:"- %s")
253253
else
254254
echo "Debug: No previous release tag found, using first commit"
255255
CHANGES=$(git log --pretty=format:"- %s")
256256
fi
257-
257+
258258
echo "Debug: Changelog content:"
259259
echo "$CHANGES"
260-
260+
261261
# Calculate hashes with corrected paths
262262
WINDOWS_ARM_HASH=$(sha256sum "artifacts/windows-arm64-binaries/Qopy-${VERSION}_arm64.msi" | awk '{ print $1 }')
263263
WINDOWS_64_HASH=$(sha256sum "artifacts/windows-x64-binaries/Qopy-${VERSION}_x64.msi" | awk '{ print $1 }')
@@ -279,11 +279,11 @@ jobs:
279279
280280
RELEASE_BODY=$(cat <<-EOF
281281
## ♻️ Changelog
282-
282+
283283
$CHANGES
284-
284+
285285
## ⬇️ Downloads
286-
286+
287287
- [Windows (x64)](https://github.com/${{ github.repository }}/releases/download/v${VERSION}/Qopy-${VERSION}_x64.msi) - ${WINDOWS_64_HASH}
288288
- [Windows (ARM64)](https://github.com/${{ github.repository }}/releases/download/v${VERSION}/Qopy-${VERSION}_arm64.msi) - ${WINDOWS_ARM_HASH}
289289
- [macOS (Silicon)](https://github.com/${{ github.repository }}/releases/download/v${VERSION}/Qopy-${VERSION}_silicon.dmg) - ${MAC_SILICON_HASH}
@@ -312,4 +312,4 @@ jobs:
312312
artifacts/**/*.deb
313313
artifacts/**/*.AppImage
314314
artifacts/**/*.rpm
315-
body: ${{ env.RELEASE_BODY }}
315+
body: ${{ env.RELEASE_BODY }}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ You can use GitHub Codespaces for online development:
9595

9696
[![][codespaces-shield]][codespaces-link]
9797

98-
Or to get Qopy set up on your machine, you'll need to have Rust and pnpm installed. Then, follow these steps:
98+
Or to get Qopy set up on your machine, you'll need to have Rust and bun installed. Then, follow these steps:
9999

100100
```zsh
101101
git clone https://github.com/0pandadev/Qopy.git
102102
cd Qopy
103-
pnpm i
104-
pnpm dev
103+
bun i
104+
bun dev
105105
```
106106

107107
> \[!TIP]
@@ -113,7 +113,7 @@ pnpm dev
113113
To build for production simply execute:
114114

115115
```zsh
116-
pnpm build
116+
bun build
117117
```
118118

119119
> \[!NOTE]

src-tauri/tauri.conf.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"build": {
66
"frontendDist": "../dist",
77
"devUrl": "http://localhost:3000",
8-
"beforeDevCommand": "pnpm nuxt dev",
9-
"beforeBuildCommand": "pnpm nuxt generate"
8+
"beforeDevCommand": "bun nuxt dev",
9+
"beforeBuildCommand": "bun nuxt generate"
1010
},
1111
"app": {
1212
"windows": [
@@ -51,9 +51,7 @@
5151
"plugins": {
5252
"updater": {
5353
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDExNDIzNjA1QjE0NjU1OTkKUldTWlZVYXhCVFpDRWNvNmt0UE5lQmZkblEyZGZiZ2tHelJvT2YvNVpLU1RIM1RKZFQrb2tzWWwK",
54-
"endpoints": [
55-
"https://qopy.pandadev.net/"
56-
]
54+
"endpoints": ["https://qopy.pandadev.net/"]
5755
}
5856
},
5957
"$schema": "../node_modules/@tauri-apps/cli/schema.json"

0 commit comments

Comments
 (0)