[GHA] Dynamic refs for third-party OV-related repos (openvinotoolkit#…

…26564) To avoid manual updates where we can (in repos with the same branching systems as OV)
ynimmaga · Sep 12, 2024 · 2d7adc5 · 2d7adc5
1 parent d5eeea1
commit 2d7adc5
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/android_arm64.yml b/.github/workflows/android_arm64.yml
@@ -15,6 +15,9 @@ concurrency:
 
 permissions: read-all
 
+env:
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
+
 jobs:
   Smart_CI:
     runs-on: ubuntu-latest
@@ -122,7 +125,7 @@ jobs:
           repository: 'openvinotoolkit/openvino.genai'
           path: ${{ env.OPENVINO_GENAI_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Clone vcpkg
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

diff --git a/.github/workflows/android_x64.yml b/.github/workflows/android_x64.yml
@@ -15,6 +15,9 @@ concurrency:
 
 permissions: read-all
 
+env:
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
+
 jobs:
   Smart_CI:
     runs-on: ubuntu-latest
@@ -105,7 +108,7 @@ jobs:
           repository: 'openvinotoolkit/openvino.genai'
           path: ${{ env.OPENVINO_GENAI_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       #
       # Print system info

diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -5,6 +5,9 @@ on:
       openvinoRef:
         description: 'Branch, tag or commit hash to clone openvino from. Taken from event context if not set'
         type: string
+      openvinoContribRef:
+        description: 'Branch, tag or commit hash to clone openvino_contrib from. Taken from event context if not set'
+        type: string
   schedule:
     # run daily at 00:00
     - cron: '0 0 * * *'
@@ -19,6 +22,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Build:
@@ -58,7 +62,7 @@ jobs:
           repository: 'openvinotoolkit/openvino_contrib'
           path: ${{ env.OPENVINO_CONTRIB_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ inputs.openvinoContribRef || env.TARGET_BRANCH }}
 
       #
       # Dependencies

diff --git a/.github/workflows/job_build_linux.yml b/.github/workflows/job_build_linux.yml
@@ -56,6 +56,7 @@ permissions: read-all
 
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Build:
@@ -110,7 +111,7 @@ jobs:
           repository: 'openvinotoolkit/openvino_contrib'
           path: ${{ env.OPENVINO_CONTRIB_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Generate product manifest and set CI_BUILD_NUMBER & CI_BUILD_DEV_TAG
         id: create_manifest

diff --git a/.github/workflows/job_build_windows.yml b/.github/workflows/job_build_windows.yml
@@ -19,6 +19,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/win
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Build:
@@ -56,7 +57,7 @@ jobs:
         with:
           repository: 'openvinotoolkit/openvino_contrib'
           path: 'openvino_contrib'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Set CCACHE_REMOTE_DIR based on event
         shell: bash

diff --git a/.github/workflows/job_tokenizers.yml b/.github/workflows/job_tokenizers.yml
@@ -26,6 +26,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Openvino_tokenizers:
@@ -70,7 +71,7 @@ jobs:
         with:
           repository: 'openvinotoolkit/openvino_tokenizers'
           path: ${{ env.OPENVINO_TOKENIZERS_REPO }}
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Download OpenVINO package
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

diff --git a/.github/workflows/linux_arm64.yml b/.github/workflows/linux_arm64.yml
@@ -17,6 +17,7 @@ permissions: read-all
 
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Smart_CI:
@@ -121,7 +122,7 @@ jobs:
           repository: 'openvinotoolkit/openvino_contrib'
           path: ${{ env.OPENVINO_CONTRIB_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Generate product manifest and set CI_BUILD_NUMBER & CI_BUILD_DEV_TAG
         id: create_manifest

diff --git a/.github/workflows/linux_conditional_compilation.yml b/.github/workflows/linux_conditional_compilation.yml
@@ -18,6 +18,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Smart_CI:
@@ -118,7 +119,7 @@ jobs:
           repository: 'openvinotoolkit/testdata'
           path: ${{ env.MODELS_PATH }}
           lfs: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       #
       # Print system info
@@ -291,7 +292,7 @@ jobs:
           repository: 'openvinotoolkit/testdata'
           path: ${{ env.MODELS_PATH }}
           lfs: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Download selective build statistics package
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8

diff --git a/.github/workflows/linux_sanitizers.yml b/.github/workflows/linux_sanitizers.yml
@@ -16,6 +16,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Build:
@@ -75,7 +76,7 @@ jobs:
           repository: 'openvinotoolkit/openvino_contrib'
           path: ${{ env.OPENVINO_CONTRIB_REPO }}
           submodules: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       #
       # Print system info

diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml
@@ -21,6 +21,7 @@ permissions: read-all
 env:
   PIP_CACHE_PATH: /mount/caches/pip/linux
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Smart_CI:
@@ -450,7 +451,7 @@ jobs:
         with:
           repository: 'openvinotoolkit/openvino_contrib'
           path: ${{ env.OPENVINO_CONTRIB_REPO }}
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       #
       # Build

diff --git a/.github/workflows/windows_conditional_compilation.yml b/.github/workflows/windows_conditional_compilation.yml
@@ -20,6 +20,7 @@ permissions: read-all
 
 env:
   PYTHON_VERSION: '3.11'
+  TARGET_BRANCH: ${{ github.base_ref || github.event.merge_group.base_ref || github.ref }}
 
 jobs:
   Smart_CI:
@@ -83,7 +84,7 @@ jobs:
           repository: 'openvinotoolkit/testdata'
           path: 'testdata'
           lfs: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       #
       # Print system info
@@ -291,7 +292,7 @@ jobs:
           repository: 'openvinotoolkit/testdata'
           path: 'testdata'
           lfs: 'true'
-          ref: 'master'
+          ref: ${{ env.TARGET_BRANCH }}
 
       - name: Download selective build statistics package
         uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8