diff --git a/.github/workflows/Build ThunderOnWindows.yml b/.github/workflows/Build ThunderOnWindows.yml index 78e5e16..ba352cb 100644 --- a/.github/workflows/Build ThunderOnWindows.yml +++ b/.github/workflows/Build ThunderOnWindows.yml @@ -3,9 +3,9 @@ name: Build ThunderOnWindows on: workflow_dispatch: push: - branches: ["master"] + branches: ["master", "R*"] pull_request: - branches: ["master"] + branches: ["master", "R*"] env: devEnv: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\devenv.com @@ -23,47 +23,82 @@ jobs: # ----- Checkout ----- name: Build type - ${{matrix.type}}${{matrix.version}} steps: + - name: Resolve release dependency branch + id: release + shell: bash + env: + BUILD_BRANCH: ${{ github.base_ref || github.ref_name }} + REF_TYPE: ${{ github.ref_type }} + run: | + release_ref= + if [[ "$REF_TYPE" == 'branch' && "$BUILD_BRANCH" == R* ]]; then + release_ref="refs/heads/$BUILD_BRANCH" + fi + echo "ref=$release_ref" >> "$GITHUB_OUTPUT" + echo "Dependency branch: ${release_ref:-repository default}" + - name: Checkout ThunderOnWindows uses: actions/checkout@v4 with: path: ThunderOnWindows - repository: WebPlatformForEmbedded/ThunderOnWindows + repository: ${{ github.repository }} - name: Checkout Thunder uses: actions/checkout@v4 with: path: ThunderOnWindows/Thunder repository: rdkcentral/Thunder + ref: ${{ steps.release.outputs.ref }} - name: Checkout ThunderTools uses: actions/checkout@v4 with: path: ThunderOnWindows/ThunderTools repository: rdkcentral/ThunderTools + ref: ${{ steps.release.outputs.ref }} - name: Checkout ThunderClientLibraries uses: actions/checkout@v4 with: path: ThunderOnWindows/ThunderClientLibraries repository: rdkcentral/ThunderClientLibraries + ref: ${{ steps.release.outputs.ref }} - name: Checkout ThunderInterfaces uses: actions/checkout@v4 with: path: ThunderOnWindows/ThunderInterfaces repository: rdkcentral/ThunderInterfaces + ref: ${{ steps.release.outputs.ref }} - name: Checkout ThunderNanoServices uses: actions/checkout@v4 with: path: ThunderOnWindows/ThunderNanoServices repository: rdkcentral/ThunderNanoServices + ref: ${{ steps.release.outputs.ref }} - name: Checkout ThunderNanoServicesRDK uses: actions/checkout@v4 with: path: ThunderOnWindows/ThunderNanoServicesRDK repository: WebPlatformForEmbedded/ThunderNanoServicesRDK + ref: ${{ steps.release.outputs.ref }} + + - name: Log source revisions + shell: bash + run: | + for repository in \ + ThunderOnWindows \ + ThunderOnWindows/Thunder \ + ThunderOnWindows/ThunderTools \ + ThunderOnWindows/ThunderClientLibraries \ + ThunderOnWindows/ThunderInterfaces \ + ThunderOnWindows/ThunderNanoServices \ + ThunderOnWindows/ThunderNanoServicesRDK + do + git -C "$repository" log -1 --format="$repository: %H" + done # ----- Install & Build ----- - name: Install jsonref