Skip to content

Commit dd8f884

Browse files
committed
CI: modify build snapcraft
1 parent d2c6c1a commit dd8f884

5 files changed

Lines changed: 8 additions & 17 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939

4040
snap:
4141
uses: ./.github/workflows/snap.yml
42-
if: false
4342
secrets: inherit
4443

4544
docker:
@@ -126,7 +125,6 @@ jobs:
126125

127126
- name: Download snap
128127
uses: actions/download-artifact@v7
129-
if: false
130128
with:
131129
pattern: ${{ needs.snap.outputs.name }}*
132130
path: ${{ env.artifact_path }}

.github/workflows/snap.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,12 @@ jobs:
2828
- name: Check out Git repository
2929
uses: actions/checkout@v6
3030

31-
- name: Install Snapcraft
32-
uses: samuelmeuli/action-snapcraft@v3
33-
34-
# You can now run Snapcraft shell commands
35-
- name: Build snap
36-
run: |
37-
#sudo snap install snapcraft --classic
38-
#sudo usermod -aG lxd $USER
39-
snapcraft -v --debug
31+
- name: build with snapcraft
32+
id: snapcraft
33+
uses: snapcore/action-build@v1
4034

4135
- name: Update artifact
4236
uses: actions/upload-artifact@v7
4337
with:
4438
name: ${{ env.artifact_name }}
45-
path: |
46-
${{github.workspace}}/*.snap
39+
path: ${{ steps.snapcraft.outputs.snap }}

docs/Compile/Linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ See: [Script](#Script)
751751
snapcraft build [<part-name>]
752752
snapcraft stage [<part-name>]
753753
snapcraft prime [<part-name>]
754-
snapcraft pack or snapcraft
754+
snapcraft pack
755755
756756
- Iterating over a build: https://snapcraft.io/docs/iterating-over-a-build
757757
The following commands enable you to step into this encapsulated environment:

docs/Compile/Linux_zh_CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -779,7 +779,7 @@ CMake 使用参数 -DENABLE_UPDATE_TRANSLATIONS=ON 会自行产生资源文件
779779
780780
~$ git clone https://github.com/KangLin/RabbitRemoteControl.git
781781
~$ cd RabbitRemoteControl
782-
~$ snapcraft -v
782+
~$ snapcraft pack -v
783783
784784
这些生命周期步骤中的每一个都可以从命令行运行,
785785
并且该命令可以是特定于部件的命令,也可以是应用于项目中的所有部件的命令。
@@ -789,7 +789,7 @@ CMake 使用参数 -DENABLE_UPDATE_TRANSLATIONS=ON 会自行产生资源文件
789789
snapcraft build [<part-name>]
790790
snapcraft stage [<part-name>]
791791
snapcraft prime [<part-name>]
792-
snapcraft pack or snapcraft
792+
snapcraft pack
793793
```
794794
795795
- 迭代构建: https://snapcraft.io/docs/iterating-over-a-build

snap/snapcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description: |
1919
multi-protocol remote control software.
2020
.
2121
Allows you to use any device and system in anywhere and remotely manage
22-
any device and system in any way.
22+
any device and system in any way.
2323
.
2424
It include remote desktop, remote control, remote terminal, player, network tools etc functions.
2525
.

0 commit comments

Comments
 (0)