Skip to content

Commit f5bf0d3

Browse files
Neved4Neved4
authored
Merge branch 'main' into window-state
2 parents 59de259 + 5acc9eb commit f5bf0d3

File tree

11 files changed

+176
-152
lines changed

11 files changed

+176
-152
lines changed

‎.github/workflows/archive.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
cd ..
1717
zip ${{ github.event.repository.name }}/${{ github.event.repository.name }}-${{ github.ref_name }}.zip ${{ github.event.repository.name }} -r
1818
- name: Upload zip to release
19-
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
19+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
2020
with:
2121
files: |
2222
${{ github.event.repository.name }}-${{ github.ref_name }}.zip

‎.github/workflows/cla.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: 'CLA Assistant'
1313
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
1414
# Beta Release
15-
uses: cla-assistant/github-action@v2.4.0
15+
uses: cla-assistant/github-action@v2.5.1
1616
env:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
# the below token should have repo scope and must be manually added by you in the repository's secret

‎.github/workflows/tauri.yml

+12-27
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ jobs:
1212
uses: actions/checkout@v4.1.7
1313
with:
1414
submodules: true
15-
- name: Get release
16-
id: get_release
17-
uses: bruceadams/get-release@74c3d60f5a28f358ccf241a00c9021ea16f0569f
18-
env:
19-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2015
- name: Setup node
2116
uses: actions/setup-node@v4.0.3
2217
with:
@@ -29,14 +24,14 @@ jobs:
2924
- name: Install tauri dependencies
3025
run: npm ci
3126
- name: Build desktop app with Tauri
32-
uses: tauri-apps/tauri-action@v0.5.9
27+
uses: tauri-apps/tauri-action@v0.5.13
3328
env:
3429
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3530
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
3631
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
3732
NODE_OPTIONS: "--max_old_space_size=4096"
3833
with:
39-
releaseId: ${{ steps.get_release.outputs.upload_url }}
34+
releaseId: ${{ github.event.release.upload_url }}
4035
- name: Get app version (windows)
4136
run: |
4237
$json = (Get-Content "src-tauri\tauri.conf.json" -Raw) | ConvertFrom-Json
@@ -55,7 +50,7 @@ jobs:
5550
run: Move-Item "src-tauri\target\release\bundle\msi\Cinny_${{ env.TAURI_VERSION }}_x64_en-US.msi.zip.sig" "src-tauri\target\release\bundle\msi\Cinny_desktop-x86_64.msi.zip.sig"
5651
shell: pwsh
5752
- name: Upload tagged release
58-
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
53+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
5954
with:
6055
files: |
6156
src-tauri/target/release/bundle/msi/Cinny_desktop-x86_64.msi
@@ -71,11 +66,6 @@ jobs:
7166
uses: actions/checkout@v4.1.7
7267
with:
7368
submodules: true
74-
- name: Get release
75-
id: get_release
76-
uses: bruceadams/get-release@74c3d60f5a28f358ccf241a00c9021ea16f0569f
77-
env:
78-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7969
- name: Setup node
8070
uses: actions/setup-node@v4.0.3
8171
with:
@@ -92,17 +82,17 @@ jobs:
9282
- name: Install tauri dependencies
9383
run: npm ci
9484
- name: Build desktop app with Tauri
95-
uses: tauri-apps/tauri-action@v0.5.9
85+
uses: tauri-apps/tauri-action@v0.5.13
9686
env:
9787
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9888
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
9989
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
10090
NODE_OPTIONS: "--max_old_space_size=4096"
10191
with:
102-
releaseId: ${{ steps.get_release.outputs.upload_url }}
92+
releaseId: ${{ github.event.release.upload_url }}
10393
- name: Get app version
10494
id: vars
105-
run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
95+
run: echo "tag=$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')" >> $GITHUB_OUTPUT
10696
- name: Move deb
10797
run: mv "src-tauri/target/release/bundle/deb/cinny_${{ steps.vars.outputs.tag }}_amd64.deb" "src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb"
10898
- name: Move AppImage
@@ -112,7 +102,7 @@ jobs:
112102
- name: Move AppImage.tar.gz.sig
113103
run: mv "src-tauri/target/release/bundle/appimage/cinny_${{ steps.vars.outputs.tag }}_amd64.AppImage.tar.gz.sig" "src-tauri/target/release/bundle/appimage/Cinny_desktop-x86_64.AppImage.tar.gz.sig"
114104
- name: Upload tagged release
115-
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
105+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
116106
with:
117107
files: |
118108
src-tauri/target/release/bundle/deb/Cinny_desktop-x86_64.deb
@@ -128,11 +118,6 @@ jobs:
128118
uses: actions/checkout@v4.1.7
129119
with:
130120
submodules: true
131-
- name: Get release
132-
id: get_release
133-
uses: bruceadams/get-release@74c3d60f5a28f358ccf241a00c9021ea16f0569f
134-
env:
135-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
136121
- name: Setup node
137122
uses: actions/setup-node@v4.0.3
138123
with:
@@ -147,26 +132,26 @@ jobs:
147132
- name: Install tauri dependencies
148133
run: npm ci
149134
- name: Build desktop app with Tauri
150-
uses: tauri-apps/tauri-action@v0.5.9
135+
uses: tauri-apps/tauri-action@v0.5.13
151136
env:
152137
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
153138
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
154139
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
155140
NODE_OPTIONS: "--max_old_space_size=4096"
156141
with:
157-
releaseId: ${{ steps.get_release.outputs.upload_url }}
142+
releaseId: ${{ github.event.release.upload_url }}
158143
args: "--target universal-apple-darwin"
159144
- name: Get app version
160145
id: vars
161-
run: echo ::set-output name=tag::$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')
146+
run: echo "tag=$(jq .package.version src-tauri/tauri.conf.json | tr -d '"')" >> $GITHUB_OUTPUT
162147
- name: Move dmg
163148
run: mv "src-tauri/target/universal-apple-darwin/release/bundle/dmg/Cinny_${{ steps.vars.outputs.tag }}_universal.dmg" "src-tauri/target/universal-apple-darwin/release/bundle/dmg/Cinny_desktop-universal.dmg"
164149
- name: Move app.tar.gz
165150
run: mv "src-tauri/target/universal-apple-darwin/release/bundle/macos/Cinny.app.tar.gz" "src-tauri/target/universal-apple-darwin/release/bundle/macos/Cinny_desktop-universal.app.tar.gz"
166151
- name: Move app.tar.gz.sig
167152
run: mv "src-tauri/target/universal-apple-darwin/release/bundle/macos/Cinny.app.tar.gz.sig" "src-tauri/target/universal-apple-darwin/release/bundle/macos/Cinny_desktop-universal.app.tar.gz.sig"
168153
- name: Upload tagged release
169-
uses: softprops/action-gh-release@a74c6b72af54cfa997e81df42d94703d6313a2d0
154+
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
170155
with:
171156
files: |
172157
src-tauri/target/universal-apple-darwin/release/bundle/dmg/Cinny_desktop-universal.dmg
@@ -186,4 +171,4 @@ jobs:
186171
- name: Run release.json
187172
run: npm run release
188173
env:
189-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ jobs:
3535
- name: Install tauri dependencies
3636
run: npm ci
3737
- name: Build desktop app with Tauri
38-
uses: tauri-apps/tauri-action@v0.5.9
38+
uses: tauri-apps/tauri-action@v0.5.13
3939
env:
4040
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎cinny

Submodule cinny updated 118 files

‎package-lock.json

+46-46
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cinny",
3-
"version": "4.0.3",
3+
"version": "4.2.1",
44
"description": "Yet another matrix client",
55
"main": "index.js",
66
"engines": {
@@ -18,7 +18,7 @@
1818
},
1919
"devDependencies": {
2020
"@actions/github": "6.0.0",
21-
"@tauri-apps/cli": "1.6.0",
21+
"@tauri-apps/cli": "1.6.1",
2222
"node-fetch": "3.3.2"
2323
}
2424
}

0 commit comments

Comments
 (0)