Skip to content

Commit 9803583

Browse files
frequency403frequency403
committed
Merge branch 'development'
# Conflicts: # .github/workflows/auto-tag.yml # .github/workflows/staging.yml # OpenSSH_GUI.slnx
2 parents 32c869a + 87a8649 commit 9803583

3 files changed

Lines changed: 50 additions & 42 deletions

File tree

‎.github/workflows/auto-tag.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
BRANCH="${{ github.event.pull_request.head.ref }}"
3131
VERSION="${BRANCH#release/}"
3232
echo "VERSION=$VERSION" >> "$GITHUB_OUTPUT"
33-
echo "TAG=${VERSION}" >> "$GITHUB_OUTPUT"
34-
echo "Detected version: $VERSION (tag: ${VERSION})"
33+
echo "TAG=v${VERSION}" >> "$GITHUB_OUTPUT"
34+
echo "Detected version: $VERSION (tag: v${VERSION})"
3535
3636
- name: Check if tag already exists
3737
id: check

‎.github/workflows/staging.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Staging / Nightly Build
33
on:
44
push:
55
branches:
6-
- develop
6+
- development
77

88
env:
99
BUILD_CONFIGURATION: Release
@@ -154,6 +154,7 @@ jobs:
154154
run: gh release delete nightly --yes --cleanup-tag 2>/dev/null || true
155155

156156
- name: Create nightly release
157+
id: create_release
157158
uses: softprops/action-gh-release@v2
158159
with:
159160
tag_name: nightly
@@ -165,7 +166,13 @@ jobs:
165166
166167
> Automated nightly build — not intended for production use.
167168
prerelease: true
169+
draft: true
168170
files: "artifacts/**/*"
171+
172+
- name: Publish nightly release
173+
env:
174+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
175+
run: gh release edit nightly --draft=false --prerelease
169176

170177
# --- JOB 3: AUR NIGHTLY ---
171178
deploy-aur-nightly:

‎OpenSSH_GUI.slnx‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
11
<Solution>
22
<Configurations>
3-
<Platform Name="Any CPU"/>
4-
<Platform Name="x64"/>
5-
<Platform Name="x86"/>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
66
</Configurations>
77
<Folder Name="/AUR Files/">
8-
<File Path="openssh-gui-bin/PKGBUILD"/>
9-
<File Path="openssh-gui-git/PKGBUILD"/>
10-
<File Path="openssh-gui.desktop"/>
8+
<File Path="openssh-gui-bin/PKGBUILD" />
9+
<File Path="openssh-gui-git/PKGBUILD" />
10+
<File Path="openssh-gui.desktop" />
1111
</Folder>
1212
<Folder Name="/CI/">
13-
<File Path=".github/FUNDING.yml"/>
14-
<File Path=".github/workflows/build.yml"/>
15-
<File Path=".github/workflows/staging.yml"/>
13+
<File Path=".github/FUNDING.yml" />
14+
<File Path=".github/workflows/build.yml" />
15+
<File Path=".github/workflows/staging.yml" />
16+
<File Path=".github\workflows\auto-tag.yml" />
1617
</Folder>
1718
<Folder Name="/Images/">
18-
<File Path="images/AddKeyWindow.png"/>
19-
<File Path="images/AppSettings.png"/>
20-
<File Path="images/ConnectToServerQuickConnect.png"/>
21-
<File Path="images/ConnectToServerWindow.png"/>
22-
<File Path="images/ConnectToServerWindowSuccess.png"/>
23-
<File Path="images/ConnectToServerWindowWithKey.png"/>
24-
<File Path="images/EditAuthorizedKeysWindow.png"/>
25-
<File Path="images/EditAuthorizedKeysWindowRemote.png"/>
26-
<File Path="images/ExportKeyWindow.png"/>
27-
<File Path="images/FoundPasswordProtectedKey.png"/>
28-
<File Path="images/KnownHostsWindow.png"/>
29-
<File Path="images/MainWindow.png"/>
30-
<File Path="images/NewMainUI.png"/>
31-
<File Path="images/ProvidePasswordPrompt.png"/>
32-
<File Path="images/SettingsContextMenu.png"/>
33-
<File Path="images/ShowForgetPws.png"/>
34-
<File Path="images/Sorted.png"/>
35-
<File Path="images/tooltip.png"/>
36-
<File Path="images/tooltipKey.png"/>
37-
<File Path="images/tooltipServer.png"/>
19+
<File Path="images/AddKeyWindow.png" />
20+
<File Path="images/AppSettings.png" />
21+
<File Path="images/ConnectToServerQuickConnect.png" />
22+
<File Path="images/ConnectToServerWindow.png" />
23+
<File Path="images/ConnectToServerWindowSuccess.png" />
24+
<File Path="images/ConnectToServerWindowWithKey.png" />
25+
<File Path="images/EditAuthorizedKeysWindow.png" />
26+
<File Path="images/EditAuthorizedKeysWindowRemote.png" />
27+
<File Path="images/ExportKeyWindow.png" />
28+
<File Path="images/FoundPasswordProtectedKey.png" />
29+
<File Path="images/KnownHostsWindow.png" />
30+
<File Path="images/MainWindow.png" />
31+
<File Path="images/NewMainUI.png" />
32+
<File Path="images/ProvidePasswordPrompt.png" />
33+
<File Path="images/SettingsContextMenu.png" />
34+
<File Path="images/ShowForgetPws.png" />
35+
<File Path="images/Sorted.png" />
36+
<File Path="images/tooltip.png" />
37+
<File Path="images/tooltipKey.png" />
38+
<File Path="images/tooltipServer.png" />
3839
</Folder>
3940
<Folder Name="/Solution Items/">
40-
<File Path=".gitignore"/>
41-
<File Path="Directory.Build.props"/>
42-
<File Path="Directory.Build.targets"/>
43-
<File Path="LICENSE"/>
44-
<File Path="README.md"/>
41+
<File Path=".gitignore" />
42+
<File Path="Directory.Build.props" />
43+
<File Path="Directory.Build.targets" />
44+
<File Path="LICENSE" />
45+
<File Path="README.md" />
4546
</Folder>
46-
<Project Path="OpenSSH_GUI.Core/OpenSSH_GUI.Core.csproj"/>
47-
<Project Path="OpenSSH_GUI.Dialogs/OpenSSH_GUI.Dialogs.csproj"/>
48-
<Project Path="OpenSSH_GUI.SshConfig/OpenSSH_GUI.SshConfig.csproj"/>
49-
<Project Path="OpenSSH_GUI.Tests/OpenSSH_GUI.Tests.csproj"/>
47+
<Project Path="OpenSSH_GUI.Core/OpenSSH_GUI.Core.csproj" />
48+
<Project Path="OpenSSH_GUI.Dialogs/OpenSSH_GUI.Dialogs.csproj" />
49+
<Project Path="OpenSSH_GUI.SshConfig/OpenSSH_GUI.SshConfig.csproj" />
50+
<Project Path="OpenSSH_GUI.Tests/OpenSSH_GUI.Tests.csproj" />
5051
<Project Path="OpenSSH_GUI/OpenSSH_GUI.csproj">
51-
<Deploy Solution="Debug|Any CPU"/>
52+
<Deploy Solution="Debug|Any CPU" />
5253
</Project>
5354
</Solution>

0 commit comments

Comments
 (0)