Skip to content

Commit 9b3fc45

Browse files
zty012zty012
committed
💚 Fix wrong paths in CI
1 parent 4d32d11 commit 9b3fc45

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

‎.github/workflows/nightly.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,25 @@ jobs:
8080
- name: Rust cache
8181
uses: swatinem/rust-cache@v2
8282
with:
83-
workspaces: "./src-tauri -> target"
83+
workspaces: "./app/src-tauri -> target"
8484

8585
- name: edit version (linux only)
8686
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
8787
run: |
88-
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.0-nightly.r${{ github.run_number }}\"/" src-tauri/tauri.conf.json
88+
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.0-nightly.r${{ github.run_number }}\"/" app/src-tauri/tauri.conf.json
8989
9090
- name: edit version (macos only)
9191
if: matrix.platform == 'macos-latest' # This must match the platform value defined above.
9292
run: |
93-
sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.0-nightly.r${{ github.run_number }}\"/" src-tauri/tauri.conf.json
93+
sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.0-nightly.r${{ github.run_number }}\"/" app/src-tauri/tauri.conf.json
9494
9595
- name: edit version (windows only)
9696
if: matrix.platform == 'windows-latest' # This must match the platform value defined above.
9797
run: |
98-
$jsonContent = Get-Content -Path "src-tauri/tauri.conf.json" -Raw
98+
$jsonContent = Get-Content -Path "app.src-tauri/tauri.conf.json" -Raw
9999
$jsonObject = $jsonContent | ConvertFrom-Json
100100
$jsonObject.version = "0.0.0-nightly.r${{ github.run_number }}"
101-
$jsonObject | ConvertTo-Json -Depth 10 | Set-Content -Path "src-tauri/tauri.conf.json"
101+
$jsonObject | ConvertTo-Json -Depth 10 | Set-Content -Path "app/src-tauri/tauri.conf.json"
102102
103103
- uses: tauri-apps/tauri-action@dev
104104
env:
@@ -117,7 +117,7 @@ jobs:
117117
name: calculate sha256sum (linux only)
118118
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
119119
run: |
120-
cd src-tauri/target/release/bundle/deb
120+
cd app/src-tauri/target/release/bundle/deb
121121
sha256sum "Project Graph_0.0.0-nightly.r${{ github.run_number }}_amd64.deb" | awk '{print $1}' > sha256sum.txt
122122
echo "hash=$(cat sha256sum.txt)" >> "$GITHUB_OUTPUT"
123123
@@ -165,15 +165,15 @@ jobs:
165165
- name: Rust cache
166166
uses: swatinem/rust-cache@v2
167167
with:
168-
workspaces: "./src-tauri -> target"
168+
workspaces: "./app/src-tauri -> target"
169169

170170
- name: Edit version
171171
run: |
172-
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.${{ github.run_number }}\"/" src-tauri/tauri.conf.json
172+
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"0.0.${{ github.run_number }}\"/" app/src-tauri/tauri.conf.json
173173
174174
- name: setup sign
175175
run: |
176-
cd src-tauri/gen/android
176+
cd app/src-tauri/gen/android
177177
# create keystore.properties
178178
cat > keystore.properties <<EOF
179179
password=${{ secrets.ANDROID_RELEASE_PASSWORD }}
@@ -194,11 +194,11 @@ jobs:
194194

195195
- name: rename apk file
196196
run: |
197-
cd src-tauri/gen/android/app/build/outputs/apk/universal/release
197+
cd app/src-tauri/gen/android/app/build/outputs/apk/universal/release
198198
mv app-universal-release.apk Project.Graph_0.0.0-nightly.r${{ github.run_number }}_universal-signed.apk
199199
200200
- name: upload
201-
run: gh release upload nightly src-tauri/gen/android/app/build/outputs/apk/universal/release/Project.Graph_0.0.0-nightly.r${{ github.run_number }}_universal-signed.apk --clobber
201+
run: gh release upload nightly app/src-tauri/gen/android/app/build/outputs/apk/universal/release/Project.Graph_0.0.0-nightly.r${{ github.run_number }}_universal-signed.apk --clobber
202202
env:
203203
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
204204

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,25 @@ jobs:
7373
- name: Rust cache
7474
uses: swatinem/rust-cache@v2
7575
with:
76-
workspaces: "./src-tauri -> target"
76+
workspaces: "./app/src-tauri -> target"
7777

7878
- name: edit version (linux only)
7979
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
8080
run: |
81-
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" src-tauri/tauri.conf.json
81+
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" app/src-tauri/tauri.conf.json
8282
8383
- name: edit version (macos only)
8484
if: matrix.platform == 'macos-latest' # This must match the platform value defined above.
8585
run: |
86-
sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" src-tauri/tauri.conf.json
86+
sed -i '' "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" app/src-tauri/tauri.conf.json
8787
8888
- name: edit version (windows only)
8989
if: matrix.platform == 'windows-latest' # This must match the platform value defined above.
9090
run: |
91-
$jsonContent = Get-Content -Path "src-tauri/tauri.conf.json" -Raw
91+
$jsonContent = Get-Content -Path "app/src-tauri/tauri.conf.json" -Raw
9292
$jsonObject = $jsonContent | ConvertFrom-Json
9393
$jsonObject.version = "${{ github.event.inputs.version }}"
94-
$jsonObject | ConvertTo-Json -Depth 10 | Set-Content -Path "src-tauri/tauri.conf.json"
94+
$jsonObject | ConvertTo-Json -Depth 10 | Set-Content -Path "app/src-tauri/tauri.conf.json"
9595
9696
- uses: tauri-apps/tauri-action@v0
9797
env:
@@ -112,7 +112,7 @@ jobs:
112112
name: calculate sha256sum (linux only)
113113
if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
114114
run: |
115-
cd src-tauri/target/release/bundle/deb
115+
cd app/src-tauri/target/release/bundle/deb
116116
sha256sum "Project Graph_${{ github.event.inputs.version }}_amd64.deb" | awk '{print $1}' > sha256sum.txt
117117
echo "hash=$(cat sha256sum.txt)" >> "$GITHUB_OUTPUT"
118118
@@ -160,15 +160,15 @@ jobs:
160160
- name: Rust cache
161161
uses: swatinem/rust-cache@v2
162162
with:
163-
workspaces: "./src-tauri -> target"
163+
workspaces: "./app/src-tauri -> target"
164164

165165
- name: edit version
166166
run: |
167-
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" src-tauri/tauri.conf.json
167+
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"${{ github.event.inputs.version }}\"/" app/src-tauri/tauri.conf.json
168168
169169
- name: setup sign
170170
run: |
171-
cd src-tauri/gen/android
171+
cd app/src-tauri/gen/android
172172
# create keystore.properties
173173
cat > keystore.properties <<EOF
174174
password=${{ secrets.ANDROID_RELEASE_PASSWORD }}
@@ -187,11 +187,11 @@ jobs:
187187

188188
- name: rename apk file
189189
run: |
190-
cd src-tauri/gen/android/app/build/outputs/apk/universal/release
190+
cd app/src-tauri/gen/android/app/build/outputs/apk/universal/release
191191
mv app-universal-release.apk Project.Graph_${{ github.event.inputs.version }}_universal-signed.apk
192192
193193
- name: upload
194-
run: gh release upload v${{ github.event.inputs.version }} src-tauri/gen/android/app/build/outputs/apk/universal/release/Project.Graph_${{ github.event.inputs.version }}_universal-signed.apk --clobber
194+
run: gh release upload v${{ github.event.inputs.version }} app/src-tauri/gen/android/app/build/outputs/apk/universal/release/Project.Graph_${{ github.event.inputs.version }}_universal-signed.apk --clobber
195195
env:
196196
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
197197

0 commit comments

Comments
 (0)