Browse Source

ci: combine sdk and format workflows into single generate workflow

Dax Raad 2 months ago
parent
commit
1efdceaf10
2 changed files with 10 additions and 52 deletions
  1. 10 9
      .github/workflows/generate.yml
  2. 0 43
      .github/workflows/sdk.yml

+ 10 - 9
.github/workflows/format.yml → .github/workflows/generate.yml

@@ -1,4 +1,4 @@
-name: format
+name: generate
 
 
 on:
 on:
   push:
   push:
@@ -8,14 +8,10 @@ on:
     branches-ignore:
     branches-ignore:
       - production
       - production
   workflow_dispatch:
   workflow_dispatch:
-  workflow_run:
-    workflows: ["sdk"]
-    types:
-      - completed
+
 jobs:
 jobs:
-  format:
+  generate:
     runs-on: blacksmith-4vcpu-ubuntu-2404
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.event.workflow_run.conclusion == 'success'
     permissions:
     permissions:
       contents: write
       contents: write
     steps:
     steps:
@@ -29,9 +25,14 @@ jobs:
       - name: Setup Bun
       - name: Setup Bun
         uses: ./.github/actions/setup-bun
         uses: ./.github/actions/setup-bun
 
 
-      - name: run
+      - name: Generate SDK
         run: |
         run: |
-          ./script/format.ts
+          bun ./packages/sdk/js/script/build.ts
+          (cd packages/opencode && bun dev generate > ../sdk/openapi.json)
+          bun x prettier --write packages/sdk/openapi.json
+
+      - name: Format
+        run: ./script/format.ts
         env:
         env:
           CI: true
           CI: true
           PUSH_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}
           PUSH_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}

+ 0 - 43
.github/workflows/sdk.yml

@@ -1,43 +0,0 @@
-name: sdk
-
-on:
-  push:
-    branches-ignore:
-      - production
-  pull_request:
-    branches-ignore:
-      - production
-  workflow_dispatch:
-jobs:
-  format:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
-          ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
-
-      - name: Setup Bun
-        uses: ./.github/actions/setup-bun
-
-      - name: run
-        run: |
-          bun ./packages/sdk/js/script/build.ts
-          (cd packages/opencode && bun dev generate > ../sdk/openapi.json)
-          bun x prettier --write packages/sdk/openapi.json
-          if [ -z "$(git status --porcelain)" ]; then
-            echo "No changes to commit"
-            exit 0
-          fi
-          git config --local user.email "[email protected]"
-          git config --local user.name "GitHub Action"
-          git add -A
-          git commit -m "chore: regen sdk"
-          git push origin HEAD:${PUSH_BRANCH} --no-verify
-        env:
-          CI: true
-          PUSH_BRANCH: ${{ github.event.pull_request.head.ref || github.ref_name }}