Merge pull request 'v1.2.2' (#16) from dev into main

Reviewed-on: #16

.gitea/workflows/ci.yml

@@ -19,7 +19,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-          cache: npm
 
       - run: npm ci
 
@@ -41,7 +40,7 @@ jobs:
           password: ${{ secrets.TOKEN }}
 
       - name: Compute short SHA
-        run: echo "SHORT_SHA=${GITEA_SHA::7}" >> $GITEA_ENV
+        run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITEA_ENV
 
       - name: Build and push
         uses: docker/build-push-action@v5

.gitea/workflows/release.yml

@@ -20,7 +20,6 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-          cache: npm
 
       - run: npm ci
       - run: npm test
@@ -48,12 +47,10 @@ jobs:
         run: |
           LAST_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
           if [ -n "$LAST_TAG" ]; then
-            NOTES=$(git log "${LAST_TAG}..HEAD" --pretty=format:"- %s" --no-merges)
+            git log "${LAST_TAG}..HEAD" --pretty=format:"- %s" --no-merges > /tmp/release_notes.txt
           else
-            NOTES=$(git log --pretty=format:"- %s" --no-merges)
+            git log --pretty=format:"- %s" --no-merges > /tmp/release_notes.txt
           fi
-          NOTES_JSON=$(printf '%s' "$NOTES" | python3 -c "import sys,json; print(json.dumps(sys.stdin.read()))")
-          echo "NOTES=${NOTES_JSON}" >> $GITEA_ENV
 
       - name: Docker metadata
         id: meta
@@ -82,14 +79,9 @@ jobs:
 
       - name: Create Gitea release
         run: |
+          python3 -c "import json,os; v=os.environ['VERSION']; img=os.environ['IMAGE']; notes=open('/tmp/release_notes.txt').read(); open('/tmp/release_body.json','w').write(json.dumps({'tag_name':'v'+v,'name':'Catalyst v'+v,'body':'### Changes\n\n'+notes+'\n\n### Image\n\n'+img+':'+v,'draft':False,'prerelease':False}))"
           curl -sf -X POST \
             -H "Authorization: token ${{ secrets.TOKEN }}" \
             -H "Content-Type: application/json" \
             "${{ gitea.server_url }}/api/v1/repos/${{ gitea.repository }}/releases" \
-            -d "{
-              \"tag_name\": \"v${{ env.VERSION }}\",
-              \"name\": \"Catalyst v${{ env.VERSION }}\",
-              \"body\": \"### Changes\n\n${{ env.NOTES }}\n\n### Image\n\n\`${{ env.IMAGE }}:${{ env.VERSION }}\`\",
-              \"draft\": false,
-              \"prerelease\": false
-            }"
+            --data @/tmp/release_body.json

package.json

@@ -1,6 +1,6 @@
 {
   "name": "catalyst",
-  "version": "1.1.2",
+  "version": "1.2.2",
   "type": "module",
   "scripts": {
     "start": "node server/server.js",

tests/helpers.test.js

@@ -156,4 +156,11 @@ describe('CI workflow regressions', () => {
     // BUILD_VERSION was never passed to docker build.
     expect(ciYml).toContain('BUILD_VERSION')
   })
+
+  it('short SHA is computed with git rev-parse, not $GITEA_SHA (which is empty)', () => {
+    // Regression: ${GITEA_SHA::7} expands to "" on Gitea runners — nav showed "dev-".
+    // git rev-parse --short HEAD works regardless of which env vars the runner sets.
+    expect(ciYml).toContain('git rev-parse --short HEAD')
+    expect(ciYml).not.toContain('GITEA_SHA')
+  })
 })