Fix CI

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 894ac3a9aea15826b766768b01a91d1a585bffc3..e3b7f5379a04d4c17fb4a179b93d0036994d54ee 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -45,8 +45,8 @@ env:
   BASE_IMAGE_VERSION_NIGHTLY: "1.4.9"
 
 jobs:
-  preflight-checks:
-    name: Run tests and linting before release
+  determine-branch:
+    name: Determine release branch
     runs-on: ubuntu-latest
     outputs:
       branch: ${{ steps.branch.outputs.branch }}
@@ -64,32 +64,26 @@ jobs:
             echo "Using dev branch for $CHANNEL release"
           fi
 
-      - name: Trigger test workflow
-        uses: convictional/trigger-workflow-and-wait@v1.6.5
-        with:
-          owner: ${{ github.repository_owner }}
-          repo: server
-          github_token: ${{ secrets.PRIVILEGED_GITHUB_TOKEN }}
-          workflow_file_name: test.yml
-          ref: ${{ steps.branch.outputs.branch }}
-          wait_interval: 10
-          propagate_failure: true
-          trigger_workflow: true
-          wait_workflow: true
+  preflight-checks:
+    name: Run tests and linting before release
+    needs: determine-branch
+    uses: ./.github/workflows/test.yml
+    with:
+      ref: ${{ needs.determine-branch.outputs.branch }}
 
   validate-and-build:
     name: Validate version and build Python artifact
     runs-on: ubuntu-latest
-    needs: preflight-checks
+    needs: [determine-branch, preflight-checks]
     outputs:
       version: ${{ inputs.version }}
       is_prerelease: ${{ steps.validate.outputs.is_prerelease }}
       base_image_version: ${{ steps.validate.outputs.base_image_version }}
-      branch: ${{ needs.preflight-checks.outputs.branch }}
+      branch: ${{ needs.determine-branch.outputs.branch }}
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: ${{ needs.preflight-checks.outputs.branch }}
+          ref: ${{ needs.determine-branch.outputs.branch }}
           fetch-depth: 0
 
       - name: Validate version number format

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4cf9a17b88f96c371f312daf828ff668f10d4260..0a074fd1b664309c47262f16bd5502eb8045eda3 100644 (file)
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,6 +13,12 @@ on:
       - stable
       - dev
   workflow_dispatch:
+  workflow_call:
+    inputs:
+      ref:
+        description: "Git ref to checkout"
+        required: false
+        type: string
 
 jobs:
   lint:
@@ -22,6 +28,8 @@ jobs:
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.ref || github.ref }}
       - name: Set up Python
         uses: actions/setup-python@v6.1.0
         with:
@@ -63,6 +71,8 @@ jobs:
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.ref || github.ref }}
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6.1.0
         with: