You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@teaclave.apache.org by iv...@apache.org on 2026/10/21 08:24:03 UTC

(teaclave-trustzone-sdk) branch main updated: ci: add optee-version input to QEMU image build

This is an automated email from the ASF dual-hosted git repository.

ivila pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/teaclave-trustzone-sdk.git


The following commit(s) were added to refs/heads/main by this push:
     new 3fb454b  ci: add optee-version input to QEMU image build
3fb454b is described below

commit 3fb454bbb5a2d90b5bc3da14f9dec03b20f64ce0
Author: ivila <iv...@apache.org>
AuthorDate: Wed Oct 21 14:24:41 2026 +0800

    ci: add optee-version input to QEMU image build
    
    Require the OP-TEE version at dispatch time, pin manifest sync
    to it via repo init -b, and derive the artifact name from the
    same input instead of sniffing the latest git tag.
---
 .github/workflows/build_test_qemu_image.yml       | 12 +++++++++++-
 .github/workflows/reuse_build_test_qemu_image.yml |  9 ++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build_test_qemu_image.yml b/.github/workflows/build_test_qemu_image.yml
index d67febc..602ec91 100644
--- a/.github/workflows/build_test_qemu_image.yml
+++ b/.github/workflows/build_test_qemu_image.yml
@@ -23,7 +23,13 @@
 
 name: Build Test Qemu Image
 
-on: [workflow_dispatch]
+on:
+  workflow_dispatch:
+    inputs:
+      optee-version:
+        description: 'OP-TEE version to build (e.g. 4.11.0)'
+        required: true
+        type: string
 
 defaults:
   run:
@@ -35,21 +41,25 @@ jobs:
     with:
       runs-on: ubuntu-latest
       expand-memory: true
+      optee-version: ${{ inputs.optee-version }}
 
   amd64-ubuntu24:
     uses: ./.github/workflows/reuse_build_test_qemu_image.yml
     with:
       runs-on: ubuntu-latest
       expand-memory: false
+      optee-version: ${{ inputs.optee-version }}
 
   arm64-ubuntu24-expand-ta-memory:
     uses: ./.github/workflows/reuse_build_test_qemu_image.yml
     with:
       runs-on: ubuntu-24.04-arm
       expand-memory: true
+      optee-version: ${{ inputs.optee-version }}
 
   arm64-ubuntu24:
     uses: ./.github/workflows/reuse_build_test_qemu_image.yml
     with:
       runs-on: ubuntu-24.04-arm
       expand-memory: false
+      optee-version: ${{ inputs.optee-version }}
diff --git a/.github/workflows/reuse_build_test_qemu_image.yml b/.github/workflows/reuse_build_test_qemu_image.yml
index 8f285a7..9ca79b1 100644
--- a/.github/workflows/reuse_build_test_qemu_image.yml
+++ b/.github/workflows/reuse_build_test_qemu_image.yml
@@ -27,6 +27,10 @@ on:
         required: true
         type: boolean
         default: false
+      optee-version:
+        description: 'OP-TEE version tag to sync (e.g. 4.11.0)'
+        required: true
+        type: string
 
 defaults:
   run:
@@ -92,14 +96,13 @@ jobs:
         run: |
           mkdir -p ${{ env.QEMUV8_BUILD_FOLDER }} && 
           cd ${{ env.QEMUV8_BUILD_FOLDER }} &&
-          repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
+          repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml -b ${{ inputs.optee-version }} &&
           repo sync -j4 --no-clone-bundle
 
       - name: Get Output Name
         id: output_name
         run: |
-          cd ${{ env.QEMUV8_BUILD_FOLDER }}/optee_os && \
-            OPTEE_TAG=optee-$(git tag -l | grep -E '^v?[0-9]+\.[0-9]+\.[0-9]+$' | sort -V | tail -1)
+          OPTEE_TAG=optee-${{ inputs.optee-version }}
           OS_VERSION_TAG="ubuntu-24.04"
           ARCH_TAG=$(uname -m)
           SUFFIX_TAG=${{ inputs.expand-memory && '-expand-ta-memory' || '' }}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@teaclave.apache.org
For additional commands, e-mail: commits-help@teaclave.apache.org