Update workflows

k0gen · k0gen · commit 5a7d6f6be818 · 2025-12-22T16:34:42.000+01:00
diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml
@@ -1,4 +1,5 @@
 name: Build Service
+
 on:
   workflow_dispatch:
   pull_request:
@@ -9,123 +10,7 @@ on:
     branches: ['main', 'master', 'update/040']
 
 jobs:
-  Build_aarch64:
-    name: Build S9PK (aarch64)
-    runs-on: ubuntu-24.04-arm
-    steps:
-      - name: Prepare StartOS SDK
-        uses: k0gen/sdk@v3-optimization
-
-      - name: Checkout services repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Build aarch64 package
-        id: build
-        shell: bash
-        run: |
-          start-cli init-key
-          chmod 600 ~/.startos/developer.key.pem
-          RUST_LOG=debug RUST_BACKTRACE=1 make aarch64
-
-          PACKAGE_FILE=$(ls *_aarch64.s9pk 2>/dev/null | head -n1)
-          if [ -z "$PACKAGE_FILE" ]; then
-            echo "❌ No aarch64 package found!"
-            ls -la *.s9pk || echo "No .s9pk files found"
-            exit 1
-          fi
-
-          PACKAGE_ID=$(start-cli s9pk inspect "$PACKAGE_FILE" manifest | jq -r '.id')
-          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
-          echo "package_file=${PACKAGE_FILE}" >> $GITHUB_ENV
-          printf "\n aarch64 SHA256: $(sha256sum "${PACKAGE_FILE}") \n"
-
-      - name: Upload aarch64 .s9pk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.package_file }}
-          path: ./${{ env.package_file }}
-
-  Build_x86_64:
-    name: Build S9PK (x86_64)
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Prepare StartOS SDK
-        uses: k0gen/sdk@v3-optimization
-
-      - name: Checkout services repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Build x86_64 package
-        id: build
-        shell: bash
-        run: |
-          start-cli init-key
-          chmod 600 ~/.startos/developer.key.pem
-          RUST_LOG=debug RUST_BACKTRACE=1 make x86
-
-          PACKAGE_FILE=$(ls *_x86_64.s9pk 2>/dev/null | head -n1)
-          if [ -z "$PACKAGE_FILE" ]; then
-            echo "❌ No x86_64 package found!"
-            ls -la *.s9pk || echo "No .s9pk files found"
-            exit 1
-          fi
-
-          PACKAGE_ID=$(start-cli s9pk inspect "$PACKAGE_FILE" manifest | jq -r '.id')
-          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
-          echo "package_file=${PACKAGE_FILE}" >> $GITHUB_ENV
-          printf "\n x86_64 SHA256: $(sha256sum "${PACKAGE_FILE}") \n"
-
-      - name: Upload x86_64 .s9pk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.package_file }}
-          path: ./${{ env.package_file }}
-
-  BuildUniversal:
-    name: Build S9PK (Universal)
-    runs-on: ubuntu-24.04
-    needs: [Build_aarch64, Build_x86_64]
-    steps:
-      - name: Prepare StartOS SDK
-        uses: k0gen/sdk@v3-optimization
-
-      - name: Checkout services repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Build Universal package
-        id: build
-        shell: bash
-        run: |
-          start-cli init-key
-          chmod 600 ~/.startos/developer.key.pem
-          RUST_LOG=debug RUST_BACKTRACE=1 make
-
-          # Prefer a non-arch-suffixed universal package if present
-          PACKAGE_FILE=$(ls *.s9pk 2>/dev/null | grep -Ev '_(aarch64|x86_64)\.s9pk$' | head -n1)
-          if [ -z "$PACKAGE_FILE" ]; then
-            # Fallback: if packaging already renames to id.s9pk only, just take the first .s9pk
-            PACKAGE_FILE=$(ls *.s9pk 2>/dev/null | head -n1)
-          fi
-
-          if [ -z "$PACKAGE_FILE" ]; then
-            echo "❌ No universal package found!"
-            ls -la *.s9pk || echo "No .s9pk files found"
-            exit 1
-          fi
-
-          PACKAGE_ID=$(start-cli s9pk inspect "$PACKAGE_FILE" manifest | jq -r '.id')
-          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
-          echo "package_file=${PACKAGE_FILE}" >> $GITHUB_ENV
-          printf "\n ⚡ Universal SHA256: $(sha256sum "${PACKAGE_FILE}") \n"
-
-      - name: Upload Universal .s9pk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.package_file }}
-          path: ./${{ env.package_file }}
+  build:
+    uses: start9labs/shared-workflows/.github/workflows/buildService.yml@master
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }}
diff --git a/.github/workflows/releaseService.yml b/.github/workflows/releaseService.yml
@@ -6,78 +6,11 @@ on:
       - 'v*.*'
 
 jobs:
-  ReleasePackage:
-    runs-on: ubuntu-latest
+  release:
+    uses: start9labs/shared-workflows/.github/workflows/releaseService.yml@master
+    with:
+      REGISTRY: ${{ vars.REGISTRY }} # Optional. Defaults to https://alpha-registry-x.start9.com
+    secrets:
+      DEV_KEY: ${{ secrets.DEV_KEY }} # Required
     permissions:
-      contents: write
-    steps:
-      - name: Prepare StartOS SDK
-        uses: start9labs/sdk@v2
-
-      - name: Checkout services repository
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Build the service package
-        id: build
-        env:
-          S9DEVKEY: ${{ secrets.S9DEVKEY }}
-        run: |
-          start-cli init-key
-          if [[ -n "$S9DEVKEY" ]]; then
-            echo "Using developer key from secrets to sign the package."
-            printf '%s' "$S9DEVKEY" > ~/.startos/developer.key.pem
-          else
-            echo "Using newly generated developer key to sign the package."
-          fi
-          RUST_LOG=debug RUST_BACKTRACE=1 make
-          sleep 2
-          MANIFEST_JSON=$(start-cli s9pk inspect *.s9pk manifest)
-          PACKAGE_ID=$(echo "$MANIFEST_JSON" | jq -r '.id')
-          PACKAGE_TITLE=$(echo "$MANIFEST_JSON" | jq -r '.title')
-          echo "package_id=${PACKAGE_ID}" >> $GITHUB_ENV
-          echo "package_title=${PACKAGE_TITLE}" >> $GITHUB_ENV
-          printf "\n SHA256SUM: $(sha256sum ${PACKAGE_ID}.s9pk) \n"
-        shell: bash
-
-      - name: Generate sha256 checksum
-        run: |
-          sha256sum ${{ env.package_id }}.s9pk > ${{ env.package_id }}.s9pk.sha256
-        shell: bash
-
-      - name: Generate changelog
-        run: |
-          echo "## What's Changed" > change-log.txt
-          echo "" >> change-log.txt
-          RELEASE_NOTES=$(start-cli s9pk inspect *.s9pk manifest | jq -r '.releaseNotes') 
-          echo "${RELEASE_NOTES}" >> change-log.txt
-          echo "## SHA256 Hash" >> change-log.txt
-          echo '```' >> change-log.txt
-          sha256sum ${{ env.package_id }}.s9pk >> change-log.txt
-          echo '```' >> change-log.txt
-        shell: bash
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ github.ref_name }}
-          name: ${{ env.package_title }} ${{ github.ref_name }}
-          prerelease: true
-          body_path: change-log.txt
-          files: |
-            ./${{ env.package_id }}.s9pk
-            ./${{ env.package_id }}.s9pk.sha256
-
-      - name: Publish to Registry
-        env:
-          S9DEVKEY: ${{ secrets.S9DEVKEY }}
-          S9REGISTRY: ${{ secrets.S9REGISTRY }}
-        run: |
-          if [[ -z "$S9DEVKEY" || -z "$S9REGISTRY" ]]; then
-          echo "Publish skipped: One or both of S9DEVKEY and S9REGISTRY secrets are not set."
-          else
-          echo "Publishing package to registry..."
-          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
-          fi
-        shell: bash
+      contents: write
