Skip to content

Commit f8d56d5

Browse files
committed
update startos sdk to beta.36 / update github workflows
1 parent bfc8f6e commit f8d56d5

File tree

5 files changed

+45
-37
lines changed

5 files changed

+45
-37
lines changed

.github/workflows/buildService.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Prepare StartOS SDK
17-
uses: start9Labs/sdk@v2
17+
uses: start9labs/sdk@v2
1818

1919
- name: Checkout services repository
2020
uses: actions/checkout@v4
@@ -30,6 +30,7 @@ jobs:
3030
echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
3131
printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
3232
shell: bash
33+
3334
- name: Upload .s9pk
3435
uses: actions/upload-artifact@v4
3536
with:

.github/workflows/releaseService.yml

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,41 +12,46 @@ jobs:
1212
contents: write
1313
steps:
1414
- name: Prepare StartOS SDK
15-
uses: start9Labs/sdk@v2
15+
uses: start9labs/sdk@v2
1616

1717
- name: Checkout services repository
1818
uses: actions/checkout@v4
1919
with:
2020
submodules: recursive
2121

2222
- name: Build the service package
23+
id: build
24+
env:
25+
S9DEVKEY: ${{ secrets.S9DEVKEY }}
2326
run: |
2427
start-cli init
28+
if [[ -n "$S9DEVKEY" ]]; then
29+
echo "Using developer key from secrets to sign the package."
30+
printf '%s' "$S9DEVKEY" > ~/.startos/developer.key.pem
31+
else
32+
echo "Using newly generated developer key to sign the package."
33+
fi
2534
RUST_LOG=debug RUST_BACKTRACE=1 make
26-
27-
- name: Setting package ID and title from the manifest
28-
id: package
29-
run: |
30-
PACKAGE_ID=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.id')
31-
PACKAGE_TITLE=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.title')
35+
sleep 2
36+
MANIFEST_JSON=$(start-cli s9pk inspect *.s9pk manifest)
37+
PACKAGE_ID=$(echo "$MANIFEST_JSON" | jq -r '.id')
38+
PACKAGE_TITLE=$(echo "$MANIFEST_JSON" | jq -r '.title')
3239
echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
3340
echo "package_title=${PACKAGE_TITLE}" >> $GITHUB_ENV
3441
printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
3542
shell: bash
3643

3744
- name: Generate sha256 checksum
3845
run: |
39-
sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
46+
sha256sum ${{ env.package_id }}.s9pk > ${{ env.package_id }}.s9pk.sha256
4047
shell: bash
4148

4249
- name: Generate changelog
4350
run: |
4451
echo "## What's Changed" > change-log.txt
4552
echo "" >> change-log.txt
46-
47-
RELEASE_NOTES=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.releaseNotes')
53+
RELEASE_NOTES=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.releaseNotes')
4854
echo "${RELEASE_NOTES}" >> change-log.txt
49-
5055
echo "## SHA256 Hash" >> change-log.txt
5156
echo '```' >> change-log.txt
5257
sha256sum ${{ env.package_id }}.s9pk >> change-log.txt
@@ -66,12 +71,13 @@ jobs:
6671
6772
- name: Publish to Registry
6873
env:
69-
S9USER: ${{ secrets.S9USER }}
70-
S9PASS: ${{ secrets.S9PASS }}
74+
S9DEVKEY: ${{ secrets.S9DEVKEY }}
7175
S9REGISTRY: ${{ secrets.S9REGISTRY }}
7276
run: |
73-
if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
74-
echo "Publish skipped: missing registry credentials."
77+
if [[ -z "$S9DEVKEY" || -z "$S9REGISTRY" ]]; then
78+
echo "Publish skipped: One or both of S9DEVKEY and S9REGISTRY secrets are not set."
7579
else
76-
start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk
80+
echo "Publishing package to registry..."
81+
start-cli --registry https://$S9REGISTRY registry package add ${{ env.package_id }}.s9pk ${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/${{ env.package_id }}.s9pk
7782
fi
83+
shell: bash

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"check": "tsc --noEmit"
77
},
88
"dependencies": {
9-
"@start9labs/start-sdk": "^0.4.0-beta.33"
9+
"@start9labs/start-sdk": "^0.4.0-beta.36"
1010
},
1111
"devDependencies": {
12-
"@types/node": "^22.1.0",
13-
"@vercel/ncc": "^0.38.1",
14-
"prettier": "^3.2.5",
15-
"typescript": "^5.4.3"
12+
"@types/node": "^22.16.4",
13+
"@vercel/ncc": "^0.38.3",
14+
"prettier": "^3.6.2",
15+
"typescript": "^5.8.3"
1616
},
1717
"prettier": {
1818
"trailingComma": "all",

startos/manifest.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export const manifest = setupManifest({
1919
upstreamRepo: 'https://github.com/remcoros/axeos-monitor-aio-startos',
2020
supportSite: 'https://github.com/remcoros/axeos-monitor-aio-startos',
2121
marketingSite: 'https://github.com/remcoros/axeos-monitor-aio-startos',
22+
docsUrl: 'https://github.com/remcoros/axeos-monitor-aio-startos/blob/main/instructions.md',
2223
donationUrl: 'https://github.com/remcoros/',
2324
description: {
2425
short: 'AxeOS Monitor (all in one)',
@@ -35,7 +36,7 @@ export const manifest = setupManifest({
3536
prometheus: {
3637
arch: arch,
3738
source: {
38-
dockerTag: 'prom/prometheus:v3.4.2',
39+
dockerTag: 'prom/prometheus:v3.5.0',
3940
},
4041
} as SDKImageInputSpec,
4142
'json-exporter': {

0 commit comments

Comments
 (0)