Skip to content

Commit 18ddbc7

Browse files
authored
Merge pull request #51 from Sythsaz/chore/release-v1.5.7
chore(release): v1.5.7
2 parents 74182c7 + 40e9441 commit 18ddbc7

13 files changed

Lines changed: 51 additions & 18 deletions

.github/workflows/release.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
3434
artifacts=(
3535
"GiveawayBot.cs"
36-
"README.md"
3736
"CHANGELOG.md"
3837
)
3938
@@ -47,8 +46,11 @@ jobs:
4746
- name: Create Release
4847
uses: softprops/action-gh-release@v2
4948
with:
50-
body: ${{ steps.extract_notes.outputs.release_notes }}
49+
body: |
50+
${{ steps.extract_notes.outputs.release_notes }}
51+
52+
---
53+
**Full Documentation**: https://github.com/Sythsaz/Giveaway-Bot/wiki
5154
files: |
5255
GiveawayBot.cs
53-
README.md
5456
CHANGELOG.md

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.5.7] - 2026-02-08
11+
12+
### Changed
13+
14+
- **Release Workflow**: Updated `tools/auto-release.ps1` to create temporary `chore/release-vX.Y.Z` branches and open
15+
Pull Requests, replacing the previous `release/vX.Y.Z` branch strategy to better align with conventional commits.
16+
- **Documentation**: Updated `CONTRIBUTING.md` to reflect the new PR-based release workflow.
17+
- **Documentation**: Corrected the configuration directory path in `README.md` and `CONTRIBUTING.md` from
18+
`Giveaway Helper` to `Giveaway Bot`.
19+
- **Release Assets**: Removed `README.md` from release artifacts in favor of linking to the
20+
[Wiki](https://github.com/Sythsaz/Giveaway-Bot/wiki) in the release notes.
21+
- **Tests**: Fixed incorrect directory path in `IntegrationTests.cs` to match the actual `Giveaway Bot` folder.
22+
1023
## [1.5.6] - 2026-02-08
1124

1225
### Fixed

CONTRIBUTING.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ dotnet run
248248

249249
1. **Copy `GiveawayBot.cs`** to Streamer.bot
250250
2. **Import** into a C# action
251-
3. **Configure** `giveaway_config.json` in `data/Giveaway Helper/config/`
251+
3. **Configure** `giveaway_config.json` in `data/Giveaway Bot/config/`
252252
4. **Run** `!giveaway system test` in chat
253253
5. **Test your changes** with real commands
254254

@@ -302,27 +302,31 @@ The workflow `.github/workflows/version-consistency.yml` enforces this and fails
302302

303303
We use a streamlined **PR-based release workflow**. To release a new version:
304304

305-
1. **Run the auto-release script**:
305+
1. **Prepare the Changelog**:
306+
- Ensure all notable changes are documented in `CHANGELOG.md` under the `[Unreleased]` section.
307+
- The script will automatically move these items to the new version section.
308+
309+
2. **Run the auto-release script**:
306310

307311
```powershell
308312
# Syntax: .\tools\auto-release.ps1 -Version <NEW_VERSION>
309313
.\tools\auto-release.ps1 -Version 1.6.0
310314
```
311315

312316
This script will automatically:
313-
- Create a release branch (`release/v1.6.0`)
314317
- Bump version in `VERSION`, `.csproj`, `.cs`, and `.wiki`
315318
- Update `CHANGELOG.md` (preserving `[Unreleased]` section)
316-
- Open a Pull Request via GitHub CLI (`gh`)
319+
- Create a temporary branch and open a Pull Request via GitHub CLI (`gh`)
317320

318-
2. **Merge the Pull Request**:
321+
3. **Merge the Pull Request**:
319322
- The script will wait for you to merge the PR.
320323
- Ensure all CI checks pass.
321324
- Merge the PR into `main`.
322325

323-
3. **Finalize**:
326+
4. **Finalize**:
324327
- The script will detect the merge, pull `main`, and push the `v1.6.0` tag.
325328
- This tag triggers the final GitHub Release workflow.
329+
- **Cleanup**: The script automatically deletes both the local and remote release branches.
326330

327331
### Wiki Generation
328332

GiveawayBot.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ public static string Get(string key, string profileName, params object[] args)
448448
/// </summary>
449449
public class GiveawayManager : IDisposable
450450
{
451-
public const string Version = "1.5.6"; // Semantic Versioning (canonical: VERSION file)
451+
public const string Version = "1.5.7"; // Semantic Versioning (canonical: VERSION file)
452452

453453
// ==================== Instance Fields ====================
454454

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ All documentation has moved to the **[GitHub Wiki](https://github.com/Sythsaz/Gi
5555
- Paste the contents of `GiveawayBot.cs`.
5656
- Click "Compile" (Ensure you have added the references first).
5757
3. **Configure**:
58-
- The bot will generate a config file at `.../Streamer.bot/data/Giveaway Helper/config/giveaway_config.json`.
58+
- The bot will generate a config file at `.../Streamer.bot/data/Giveaway Bot/config/giveaway_config.json`.
5959
- Edit this file or use the [Example Configs](examples/).
6060
4. **Run**:
6161
- Type `!giveaway system test` in chat to verify installation.
@@ -70,7 +70,6 @@ All documentation has moved to the **[GitHub Wiki](https://github.com/Sythsaz/Gi
7070
Each GitHub release is expected to include these assets:
7171

7272
- `GiveawayBot.cs`
73-
- `README.md`
7473
- `CHANGELOG.md`
7574

7675
## 🤝 Contributing

RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Release Notes v1.5.6
1+
# Release Notes v1.5.7
22

33
## Security Section Guidance
44

StreamerBot.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net481</TargetFramework>
5-
<Version>1.5.6</Version>
5+
<Version>1.5.7</Version>
66
<!-- Enforce C# 7.3 compatibility (Streamer.bot runtime constraint) -->
77
<LangVersion>7.3</LangVersion>
88
<!-- Disable nullable reference types (not supported in C# 7.3) -->

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.6
1+
1.5.7

_tests/IntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ private static async Task Test_Dumps()
426426
cph.Args.Clear(); cph.Args["command"] = "!draw"; cph.Args["isBroadcaster"] = true;
427427
await m.ProcessTrigger(new CPHAdapter(cph, cph.Args));
428428
string baseDir = AppDomain.CurrentDomain.BaseDirectory;
429-
string d = Path.Combine(baseDir, "Giveaway Helper", "dumps", "Main");
429+
string d = Path.Combine(baseDir, "Giveaway Bot", "dumps", "Main");
430430
if (Directory.Exists(d) && Directory.GetFiles(d).Length > 0) Console.WriteLine("PASS");
431431
else Console.WriteLine($"FAIL (Dir exists: {Directory.Exists(d)})");
432432
}

examples/05-timed-and-custom-messages.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"MaxEntriesPerMinute": 200,
1111
"SubLuckMultiplier": 2,
12-
12+
1313
"//": "Auto-close the giveaway after 5 minutes",
1414
"TimerDuration": "5m",
1515

@@ -20,6 +20,8 @@
2020
"WinnerSelected": "🏆 FAST FINGERS! @{0} is the winner!",
2121
"EntryAccepted": "Got it {1}! You're in for the flash draw."
2222
},
23+
"//": "Custom Discord announcement",
24+
"DiscordMessage": "⚡ FLASH GIVEAWAY WINNER: **{winner}**! Claim your prize now! ⚡",
2325

2426
"//": "Enable desktop notifications for key events",
2527
"ToastNotifications": {

0 commit comments

Comments
 (0)