Merge pull request #1 from Start9Labs/update-workflows

Update workflows + typo fix

.github/workflows/buildService.yml

@@ -20,16 +20,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build the service package
+        id: build
         run: |
           git submodule update --init --recursive
           start-sdk init
           make
           PACKAGE_ID=$(yq -oy ".id" manifest.*)
-          mv ${PACKAGE_ID}*.s9pk ~/
+          echo "package_id=$PACKAGE_ID" >> $GITHUB_ENV
         shell: bash
 
       - name: Upload .s9pk
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ env.PACKAGE_ID }}.s9pk
-          path: ~/*.s9pk
+          name: ${{ env.package_id }}.s9pk
+          path: ./${{ env.package_id }}.s9pk

.github/workflows/releaseService.yml

@@ -1,78 +1,71 @@
 name: Release Service
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - 'v*.*'
 
 jobs:
   ReleasePackage:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Set up Rust Toolchain
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-      - name: Get StartOS Hash
-        run: echo "EMBASSYHASH=$(git ls-remote https://github.com/Start9Labs/start-os --branch latest | awk '{ print $1}')" >> $GITHUB_ENV
-      - name: Cache Packages
-        uses: buildjet/cache@v3
-        id: packageCache
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-nostrudel-${{ env.EMBASSYHASH }}
-      - name: Install Dependencies
-        run: |
-          sudo snap install yq deno
-          sudo apt-get install -y build-essential openssl libssl-dev libc6-dev clang libclang-dev ca-certificates
+      - name: Prepare StartOS SDK
+        uses: Start9Labs/sdk@v1
+
       - name: Checkout services repository
         uses: actions/checkout@v3
-      - name: Install Package Manager
-        id: packageManager
-        if: steps.packageCache.outputs.cache-hit != 'true'
-        run: |
-          cd ~/ && git clone https://github.com/Start9Labs/start-os.git --branch latest;
-          cd start-os;
-          git submodule update --init --recursive
-          cd backend;
-          export RUSTFLAGS="";
-          export OS_ARCH=$(uname -m);
-          ./install-sdk.sh;
-          cargo install --git=https://github.com/Start9Labs/md-packer.git --branch=main;
+
       - name: Build the service package
         run: |
           git submodule update --init --recursive
-          embassy-sdk init
+          start-sdk init
           make
+
+      - name: Setting package ID and title from the manifest
+        id: package
+        run: |
+          echo "package_id=$(yq -oy ".id" manifest.*)" >> $GITHUB_ENV
+          echo "package_title=$(yq -oy ".title" manifest.*)" >> $GITHUB_ENV
+        shell: bash
+
       - name: Generate sha256 checksum
         run: |
-          sha256sum nostrudel.s9pk > nostrudel.s9pk.sha256
+          PACKAGE_ID=${{ env.package_id }}
+          sha256sum ${PACKAGE_ID}.s9pk > ${PACKAGE_ID}.s9pk.sha256
+        shell: bash
+
       - name: Generate changelog
         run: |
+          PACKAGE_ID=${{ env.package_id }}
           echo "## What's Changed" > change-log.txt
-          yq e '.release-notes' manifest.yaml >> change-log.txt
-          echo >> change-log.txt
-          echo "### SHA 256 Hash" >> change-log.txt
-          echo "\`$(sha256sum nostrudel.s9pk)\`" >> change-log.txt
-          sha256sum nostrudel.s9pk >> change-log.txt
-      - name: Create Release
+          yq -oy '.release-notes' manifest.* >> change-log.txt
+          echo "## SHA256 Hash" >> change-log.txt
+          echo '```' >> change-log.txt
+          sha256sum ${PACKAGE_ID}.s9pk >> change-log.txt
+          echo '```' >> change-log.txt
+        shell: bash
+
+      - name: Create GitHub Release
         uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref_name }}
-          name: noStrudel ${{ github.ref_name }}
+          name: ${{ env.package_title }} ${{ github.ref_name }}
+          prerelease: true
           body_path: change-log.txt
           files: |
-            nostrudel.s9pk
-            nostrudel.s9pk.sha256
+            ./${{ env.package_id }}.s9pk
+            ./${{ env.package_id }}.s9pk.sha256
+
+      - name: Publish to Registry
+        env:
+          S9USER: ${{ secrets.S9USER }}
+          S9PASS: ${{ secrets.S9PASS }}
+          S9REGISTRY: ${{ secrets.S9REGISTRY }}
+        run: |
+          if [[ -z "$S9USER" || -z "$S9PASS" || -z "$S9REGISTRY" ]]; then
+            echo "Publish skipped: missing registry credentials."
+          else
+            start-sdk publish https://$S9USER:$S9PASS@$S9REGISTRY ${{ env.package_id }}.s9pk
+          fi

README.md

@@ -4,7 +4,7 @@
 
 # noStrudel for StartOS
 
-[noStrudel](https://github.com/hzrd149/nostrudel) is a Nostr web client for a explorting the nostr network. This repository creates the s9pk package that is installed to run noStrudel on StartOS.
+[noStrudel](https://github.com/hzrd149/nostrudel) is a Nostr web client for exploring the Nostr network. This repository creates the s9pk package that is installed to run noStrudel on StartOS.
 
 ## Dependencies