Skip to content

Commit da5ece2

Browse files
author
Thomas G.
committed
Merge branch 'hotfix/0.3.X'
2 parents 09cc819 + c998ef5 commit da5ece2

6 files changed

Lines changed: 30 additions & 61 deletions

File tree

.github/workflows/package.yml

100644100755
Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,24 @@ jobs:
4343
steps:
4444
- name: Checkout
4545
uses: actions/checkout@v4
46+
with:
47+
fetch-depth: 0
4648
- name: Download Package Artifact
4749
uses: actions/download-artifact@v4
4850
with:
4951
path: ./dist
52+
- uses: rickstaa/action-contains-tag@v1
53+
id: is_on_main
54+
with:
55+
reference: 'main'
56+
tag: '${{ github.ref }}'
5057
- name: Create Release
5158
id: create_release
52-
uses: softprops/action-gh-release@v2
59+
uses: softprops/action-gh-release@v2.2.2
5360
with:
54-
files: ./dist/*.spk
55-
draft: false
56-
prerelease: false
61+
files: ./dist/**/*.spk
62+
draft: ${{ steps.is_on_main.outputs.retval != 'true' }}
63+
prerelease: ${{ contains(github.ref, '-') }}
64+
fail_on_unmatched_files: true
65+
generate_release_notes: true
66+
body_path: CHANGELOG.md

CHANGELOG.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1+
<!-- @format -->
2+
13
# Changelog
24

35
All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
46

5-
## 0.2.0 (2025-06-09)
7+
## [0.2.1](https://github.com/tomgrv/synology-github-runner/compare/v0.2.0...v0.2.1) (2025-06-10)
68

79

8-
### Features
10+
### Bug Fixes
911

10-
* ✨ add github runner files ([4ca30f9](https://github.com/tomgrv/synology-github-runner/commit/4ca30f9dfa1468a316635bbd5e43b9d6db6eea37))
11-
* **action:** :construction_worker: Add package build action ([ada763e](https://github.com/tomgrv/synology-github-runner/commit/ada763e8fb41f201d4f2f453b1243873baa4ca52))
12+
* 🐛 release feature ([970711f](https://github.com/tomgrv/synology-github-runner/commit/970711f6cbf90389a436149fb756b3256dff7d9f))
1213

1314
## 0.2.0 (2025-06-09)
1415

15-
1616
### Features
1717

18-
* ✨ add github runner files ([4ca30f9](https://github.com/tomgrv/synology-github-runner/commit/4ca30f9dfa1468a316635bbd5e43b9d6db6eea37))
19-
* **action:** :construction_worker: Add package build action ([ada763e](https://github.com/tomgrv/synology-github-runner/commit/ada763e8fb41f201d4f2f453b1243873baa4ca52))
18+
- ✨ add github runner files ([4ca30f9](https://github.com/tomgrv/synology-github-runner/commit/4ca30f9dfa1468a316635bbd5e43b9d6db6eea37))
19+
- **action:** :construction_worker: Add package build action ([ada763e](https://github.com/tomgrv/synology-github-runner/commit/ada763e8fb41f201d4f2f453b1243873baa4ca52))

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "github-runner",
3-
"version": "0.2.0+2.325.0",
3+
"version": "0.2.1+2.325.0",
44
"description": "Run GitHub Actions jobs on your Synology NAS using myoung34/github-runner docker image.",
55
"license": "MIT",
66
"scripts": {
@@ -125,9 +125,9 @@
125125
},
126126
"synology": {
127127
"displayname": "Github Runner",
128-
"distributor": "tomgrv/synology-github-runner",
128+
"distributor": "github.com/tomgrv",
129129
"distributor_url": "https://github.com/tomgrv/synology-github-runner",
130-
"maintainer": "myoung34/docker-github-actions-runner",
130+
"maintainer": "github.com/myoung34",
131131
"maintainer_url": "https://github.com/myoung34/docker-github-actions-runner",
132132
"os_min_ver": "7.0-40337",
133133
"support_url": "https://github.com/tomgrv/synology-github-runner/issues"

synology/WIZARD_UIFILES/install_uifile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"desc": "Runner Configuration",
88
"subitems": [
99
{
10-
"key": "wizard_access_token",
10+
"key": "access_token",
1111
"desc": "Runner Access Token",
1212
"defaultValue": "",
1313
"validator": {
@@ -17,7 +17,7 @@
1717
}
1818
},
1919
{
20-
"key": "wizard_org_name",
20+
"key": "org_name",
2121
"desc": "Runner Organisation Name",
2222
"validator": {
2323
"regex": {
@@ -28,7 +28,7 @@
2828
}
2929
},
3030
{
31-
"key": "wizard_labels",
31+
"key": "labels",
3232
"desc": "Runner Labels",
3333
"emptyText": "synology",
3434
"validator": {

synology/conf/resource

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1 @@
1-
{
2-
"docker": {
3-
"services": [
4-
{
5-
"service": "github-runner",
6-
"image": "myoung34/github-runner",
7-
"container_name": "github-runner",
8-
"tag": "2.325.0",
9-
"restart": "always",
10-
"privileged": true,
11-
"volumes": [
12-
{
13-
"host_path": "/var/run/docker.sock",
14-
"container_path": "/var/run/docker.sock"
15-
}
16-
],
17-
"environment": [
18-
{
19-
"env_var": "ACCESS_TOKEN",
20-
"env_value": "{{wizard_access_token}}"
21-
},
22-
{
23-
"env_var": "RUNNER_WORKDIR",
24-
"env_value": "/tmp/github-runner"
25-
},
26-
{
27-
"env_var": "ORG_NAME",
28-
"env_value": "{{wizard_org_name}}"
29-
},
30-
{
31-
"env_var": "LABELS",
32-
"env_value": "{{wizard_labels}}"
33-
},
34-
{
35-
"env_var": "RUNNER_SCOPE",
36-
"env_value": "org"
37-
}
38-
]
39-
}
40-
]
41-
}
42-
}
1+
{}

0 commit comments

Comments
 (0)