From 634db226d86379709045f0eaec99843fd1e76c09 Mon Sep 17 00:00:00 2001
From: Mariusz Kogen <k0gen@pm.me>
Date: Wed, 29 Nov 2023 17:04:51 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=9F=20Update=20to=20Universal=20buildS?=
 =?UTF-8?q?ervice?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/buildService.yml | 55 +++++++-----------------------
 1 file changed, 13 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/buildService.yml b/.github/workflows/buildService.yml
index 44486b5..d96d1d9 100644
--- a/.github/workflows/buildService.yml
+++ b/.github/workflows/buildService.yml
@@ -3,62 +3,33 @@ name: Build Service
 on:
   workflow_dispatch:
   pull_request:
-    paths-ignore: ["*.md"]
-    branches: ["master", "next"]
+    paths-ignore: ['*.md']
+    branches: ['main', 'master']
   push:
-    paths-ignore: ["*.md"]
-    branches: ["master", "next"]
+    paths-ignore: ['*.md']
+    branches: ['main', 'master']
 
 jobs:
   BuildPackage:
     runs-on: ubuntu-latest
     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 "STARTOSHASH=$(git ls-remote https://github.com/Start9Labs/start-os --branch sdk | 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 }}-vaultwarden-${{ env.STARTOSHASH }}
-      - 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 sdk;
-          cd start-os;
-          git submodule update --init --recursive
-          cd backend;
-          export RUSTFLAGS="";
-          export OS_ARCH=$(uname -m);
-          ./install-sdk.sh;
+
       - name: Build the service package
         run: |
           git submodule update --init --recursive
           start-sdk init
           make
-          mv vaultwarden*s9pk ~/
+          PACKAGE_ID=$(yq e ".id" manifest.yaml)
+          mv ${PACKAGE_ID}*s9pk ~/
+        shell: bash
+
       - name: Upload .s9pk
         uses: actions/upload-artifact@v3
         with:
-          name: vaultwarden.s9pk
+          name: ${{ env.PACKAGE_ID }}.s9pk
           path: ~/*.s9pk