Skip to content

Commit 70356c5

Browse files
lyriselyrise
committed
fix
1 parent b8c9e9f commit 70356c5

File tree

11 files changed

+158
-49
lines changed

11 files changed

+158
-49
lines changed

‎.github/dependabot.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
version: 2
22
updates:
3-
- package-ecosystem: cargo
3+
- package-ecosystem: github-actions
44
directory: "/"
55
schedule:
6-
interval: "daily"
6+
interval: "weekly"
77
labels:
88
- "dependabot"
9+
ignore:
10+
- dependency-name: "dtolnay/rust-toolchain"
911
groups:
1012
dependencies:
1113
patterns:
1214
- "*"
13-
- package-ecosystem: nuget
14-
directory: "/"
15+
- package-ecosystem: cargo
16+
directory: "/daemon"
1517
schedule:
1618
interval: "weekly"
1719
labels:
@@ -20,14 +22,12 @@ updates:
2022
dependencies:
2123
patterns:
2224
- "*"
23-
- package-ecosystem: github-actions
24-
directory: "/"
25+
- package-ecosystem: nuget
26+
directory: "/ui-desktop"
2527
schedule:
26-
interval: "daily"
28+
interval: "weekly"
2729
labels:
2830
- "dependabot"
29-
ignore:
30-
- dependency-name: "dtolnay/rust-toolchain"
3131
groups:
3232
dependencies:
3333
patterns:

‎.github/workflows/daemon-test-slim.yml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
name: test-slim
1+
name: daemon-test-slim
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- "**"
@@ -9,23 +10,26 @@ on:
910
paths:
1011
- "daemon/**"
1112
- "!daemon/docs/**"
12-
- "!daemon/**.md"
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
1616
cancel-in-progress: true
1717

18+
defaults:
19+
run:
20+
working-directory: ./daemon
21+
1822
jobs:
1923
lint:
2024
runs-on: ubuntu-latest
2125
steps:
2226
- name: Checkout
23-
uses: actions/checkout@v5
27+
uses: actions/checkout@v4
2428
with:
2529
submodules: "recursive"
2630

2731
- name: Setup rust toolchain
28-
uses: dtolnay/rust-toolchain@1.84.0
32+
uses: dtolnay/rust-toolchain@stable
2933
with:
3034
components: clippy, rustfmt
3135
- name: Setup cargo make
@@ -42,12 +46,12 @@ jobs:
4246
runs-on: ubuntu-latest
4347
steps:
4448
- name: Checkout
45-
uses: actions/checkout@v5
49+
uses: actions/checkout@v4
4650
with:
4751
submodules: "recursive"
4852

4953
- name: Setup rust toolchain
50-
uses: dtolnay/rust-toolchain@1.84.0
54+
uses: dtolnay/rust-toolchain@stable
5155
with:
5256
components: clippy, rustfmt
5357
- name: Setup cargo make

‎.github/workflows/daemon-test.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
1-
name: test
1+
name: daemon-test
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- "main"
78
- "release/*"
89
paths:
910
- "daemon/**"
1011
- "!daemon/docs/**"
11-
- "!daemon/**.md"
1212

1313
concurrency:
1414
group: ${{ github.workflow }}-${{ github.ref }}
1515
cancel-in-progress: true
1616

17+
defaults:
18+
run:
19+
working-directory: ./daemon
20+
1721
jobs:
1822
lint:
1923
runs-on: ubuntu-latest
2024
steps:
2125
- name: Checkout
22-
uses: actions/checkout@v5
26+
uses: actions/checkout@v4
2327
with:
2428
submodules: "recursive"
2529

2630
- name: Setup rust toolchain
27-
uses: dtolnay/rust-toolchain@1.84.0
31+
uses: dtolnay/rust-toolchain@stable
2832
with:
2933
components: clippy, rustfmt
3034
- name: Setup cargo make
@@ -37,16 +41,17 @@ jobs:
3741
shared-key: lint
3842
- name: Lint
3943
run: cargo make lint
44+
4045
test:
4146
runs-on: ubuntu-latest
4247
steps:
4348
- name: Checkout
44-
uses: actions/checkout@v5
49+
uses: actions/checkout@v4
4550
with:
4651
submodules: "recursive"
4752

4853
- name: Setup rust toolchain
49-
uses: dtolnay/rust-toolchain@1.84.0
54+
uses: dtolnay/rust-toolchain@stable
5055
with:
5156
components: clippy, rustfmt
5257
- name: Setup cargo make

‎.github/workflows/release.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: release
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
tags:
7+
- "v*.*.*"
8+
9+
# env:
10+
# ContinuousIntegrationBuild: true
11+
12+
defaults:
13+
run:
14+
working-directory: ./daemon
15+
16+
jobs:
17+
linux:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- name: Checkout branch
21+
uses: actions/checkout@v4
22+
with:
23+
submodules: "recursive"
24+
25+
- name: Setup dotnet
26+
uses: actions/setup-dotnet@v4
27+
with:
28+
dotnet-version: 9.x
29+
include-prerelease: true
30+
31+
- name: Setup dotnet tool
32+
run: dotnet tool restore
33+
- name: Install dependencies
34+
run: dotnet restore
35+
- name: Build
36+
run: bash build-linux.sh
37+
38+
- name: Set variables
39+
id: variables
40+
run: echo "release_version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
41+
- name: Zip
42+
run: |
43+
cd ./pub/linux-x64 && zip -r ../../pxna-linux-x64-${{ steps.variables.outputs.release_version }}.zip ./*
44+
- name: Release
45+
uses: softprops/action-gh-release@v2
46+
with:
47+
files: |
48+
pxna-linux-x64-${{ steps.variables.outputs.release_version }}.zip
49+
50+
windows:
51+
runs-on: windows-latest
52+
steps:
53+
- name: Checkout branch
54+
uses: actions/checkout@v4
55+
with:
56+
submodules: "recursive"
57+
58+
- name: Setup dotnet
59+
uses: actions/setup-dotnet@v4
60+
with:
61+
dotnet-version: 9.x
62+
include-prerelease: true
63+
64+
- name: Setup dotnet tool
65+
run: dotnet tool restore
66+
- name: Install dependencies
67+
run: dotnet restore
68+
- name: Build
69+
run: pwsh build-win.ps1
70+
71+
- name: Set variables
72+
id: variables
73+
run: |
74+
chcp 65001 #set code page to utf-8
75+
echo ("release_version=" + $env:GITHUB_REF.replace('refs/tags/', '')) >> $env:GITHUB_OUTPUT
76+
- name: Zip
77+
uses: vimtor/action-zip@v1
78+
with:
79+
files: ./pub/win-x64
80+
dest: pxna-win-x64-${{ steps.variables.outputs.release_version }}.zip
81+
- name: Release
82+
uses: softprops/action-gh-release@v2
83+
with:
84+
files: |
85+
pxna-win-x64-${{ steps.variables.outputs.release_version }}.zip

‎.github/workflows/desktop-test-slim.yml‎ renamed to ‎.github/workflows/ui-desktop-test-slim.yml‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
name: test-slim
1+
name: ui-desktop-test-slim
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- "**"
78
- "!main"
89
- "!releases/*"
910
paths:
10-
- "desktop/**"
11-
- "!desktop/docs/**"
12-
- "!desktop/**.md"
11+
- "ui-desktop/**"
12+
- "!ui-desktop/docs/**"
1313

1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
@@ -19,6 +19,10 @@ env:
1919
StableTest: false
2020
# ContinuousIntegrationBuild: true
2121

22+
defaults:
23+
run:
24+
working-directory: ./ui-desktop
25+
2226
jobs:
2327
linux:
2428
runs-on: ubuntu-latest
@@ -27,10 +31,12 @@ jobs:
2731
uses: actions/checkout@v4
2832
with:
2933
submodules: "recursive"
34+
3035
- name: Setup dotnet
3136
uses: actions/setup-dotnet@v4
3237
with:
33-
dotnet-version: 8.x
38+
dotnet-version: 9.x
39+
3440
- name: Setup dotnet tool
3541
run: dotnet tool restore
3642
- name: Install dependencies
@@ -39,32 +45,38 @@ jobs:
3945
run: dotnet format --verify-no-changes
4046
- name: Test
4147
run: dotnet test --no-restore
48+
4249
windows:
4350
runs-on: windows-latest
4451
steps:
4552
- name: Checkout branch
4653
uses: actions/checkout@v4
4754
with:
4855
submodules: "recursive"
56+
4957
- name: Setup dotnet
5058
uses: actions/setup-dotnet@v4
5159
with:
52-
dotnet-version: 8.x
60+
dotnet-version: 9.x
61+
5362
- name: Install dependencies
5463
run: dotnet restore
5564
- name: Test
5665
run: dotnet test --no-restore
66+
5767
macos:
5868
runs-on: macos-latest
5969
steps:
6070
- name: Checkout branch
6171
uses: actions/checkout@v4
6272
with:
6373
submodules: "recursive"
74+
6475
- name: Setup dotnet
6576
uses: actions/setup-dotnet@v4
6677
with:
67-
dotnet-version: 8.x
78+
dotnet-version: 9.x
79+
6880
- name: Install dependencies
6981
run: dotnet restore
7082
- name: Test

0 commit comments

Comments
 (0)