From e7c3916ecf48dc05ac0d9efc597be3ff72daf66f Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 12:32:02 +0000 Subject: [PATCH 1/7] bump-and-release: pick connectors with checkboxes Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 128 ++++++++++++++++--------- 1 file changed, 83 insertions(+), 45 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 7f711b10..6ca04c8c 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -1,5 +1,16 @@ name: Bump and release -run-name: ${{ (inputs.version == '' && 'Not bumping version') || format('Bumping version to {0}', inputs.version) }} and ${{ (inputs.dryRun == true && 'validating') || 'releasing' }} ${{ inputs.connectors }} on the self hosted spec repo +run-name: >- + ${{ (inputs.version == '' && 'Not bumping version') || format('Bumping version to {0}', inputs.version) }} + and ${{ (inputs.dryRun == true && 'validating') || 'releasing' }} + ${{ (inputs.utilities && inputs.comscore && inputs.conviva && inputs.nielsen && inputs.sideloadedSubtitle && inputs.uplynk && 'all connectors ') + || format('{0}{1}{2}{3}{4}{5}', + inputs.utilities && 'Utilities ' || '', + inputs.comscore && 'Comscore ' || '', + inputs.conviva && 'Conviva ' || '', + inputs.nielsen && 'Nielsen ' || '', + inputs.sideloadedSubtitle && 'SideloadedSubtitle ' || '', + inputs.uplynk && 'Uplynk ' || '') + || 'no connectors ' }}on the self hosted spec repo on: workflow_dispatch: inputs: @@ -12,25 +23,79 @@ on: required: true default: true type: boolean - connectors: - description: 'Choose the Connector(s)' - required: true - type: choice - default: 'All' - options: - - All - - Utilities - - Comscore - - Conviva - - Nielsen - - SideloadedSubtitle - - Uplynk + utilities: + description: 'Utilities' + required: false + default: true + type: boolean + comscore: + description: 'Comscore' + required: false + default: true + type: boolean + conviva: + description: 'Conviva' + required: false + default: true + type: boolean + nielsen: + description: 'Nielsen' + required: false + default: true + type: boolean + sideloadedSubtitle: + description: 'SideloadedSubtitle' + required: false + default: true + type: boolean + uplynk: + description: 'Uplynk' + required: false + default: true + type: boolean jobs: Bump-And-Release: runs-on: macos-26 outputs: previousVersion: ${{ steps.store_previous_version.outputs.previousVersion }} steps: + - id: select_connectors + name: Select connectors + shell: bash + run: | + prefix="THEOplayer-Connector" + connectors=() + if [[ "${{ inputs.utilities }}" == "true" ]]; then + connectors+=("$prefix-Utilities.podspec") + fi + if [[ "${{ inputs.comscore }}" == "true" ]]; then + connectors+=("$prefix-Comscore.podspec") + fi + if [[ "${{ inputs.conviva }}" == "true" ]]; then + if [[ "${{ inputs.dryRun }}" == "true" && "${{ inputs.utilities }}" == "true" ]]; then + echo "::notice::Skipping Conviva in dry run because the selected Utilities version is not published." + else + connectors+=("$prefix-Conviva.podspec") + fi + fi + if [[ "${{ inputs.nielsen }}" == "true" ]]; then + if [[ "${{ inputs.dryRun }}" == "true" && "${{ inputs.utilities }}" == "true" ]]; then + echo "::notice::Skipping Nielsen in dry run because the selected Utilities version is not published." + else + connectors+=("$prefix-Nielsen.podspec") + fi + fi + if [[ "${{ inputs.sideloadedSubtitle }}" == "true" ]]; then + connectors+=("$prefix-SideloadedSubtitle.podspec") + fi + if [[ "${{ inputs.uplynk }}" == "true" ]]; then + connectors+=("$prefix-Uplynk.podspec") + fi + if [[ ${#connectors[@]} -eq 0 ]]; then + echo "::error::Select at least one connector." + exit 1 + fi + echo "podspecs=${connectors[*]}" >> "$GITHUB_OUTPUT" - uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '26.3.0' @@ -71,37 +136,10 @@ jobs: git push origin ${{ inputs.version }} - name: ${{ (inputs.dryRun == true && 'Validate') || 'Release' }} on the self hosted spec repo shell: bash + env: + CONNECTOR_PODSPECS: ${{ steps.select_connectors.outputs.podspecs }} run: | - # make the list of connectors - prefix="THEOplayer-Connector" - connectors=() - if [ "${{ inputs.connectors }}" == "All" ]; then - files=(*) - for file in ${files[*]} - do - if [[ $file == *.podspec ]]; then - # we add the Utilities later at index 0 - if [[ $file == *Utilities.podspec ]]; then - continue - fi - # blacklisted podspecs - if [[ $file == *VerizonMedia.podspec || $file == *Nielsen.podspec || $file == *Yospace.podspec ]]; then - continue - fi - # Conviva and Nielsen validations depend on Utilities being available, which does not get published in a dry run - # => skip Conviva and Nielsen if dry run - if [[ ${{ inputs.dryRun }} == true ]]; then - if [[ $file == *Conviva.podspec || $file == *Nielsen.podspec ]]; then - continue - fi - fi - connectors+=("$file") - fi - done - connectors=("$prefix-Utilities.podspec" "${connectors[@]}") - else - connectors+=("$prefix-${{ inputs.connectors }}.podspec") - fi + read -r -a connectors <<< "$CONNECTOR_PODSPECS" if [[ "${{ inputs.dryRun }}" == "true" ]]; then trap 'git checkout -- "${connectors[@]}"' EXIT else @@ -131,7 +169,7 @@ jobs: done Cleanup: needs: Bump-And-Release - if: (inputs.dryRun == true && inputs.version != '') && (success() || failure()) + if: (inputs.dryRun == true && inputs.version != '' && needs.Bump-And-Release.outputs.previousVersion != '') && (success() || failure()) runs-on: macos-26 steps: - uses: maxim-lobanov/setup-xcode@v1 From 0d9f5216675918dee03c75f478d933257c50b510 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 12:35:35 +0000 Subject: [PATCH 2/7] bump-and-release: untick Nielsen by default Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 6ca04c8c..75f26a25 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -41,7 +41,7 @@ on: nielsen: description: 'Nielsen' required: false - default: true + default: false type: boolean sideloadedSubtitle: description: 'SideloadedSubtitle' From 0e67b3af34b181d7a1e419c3611796cd651dd924 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 12:50:39 +0000 Subject: [PATCH 3/7] bump-and-release: untick all connectors by default Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 75f26a25..9d51bf57 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -26,17 +26,17 @@ on: utilities: description: 'Utilities' required: false - default: true + default: false type: boolean comscore: description: 'Comscore' required: false - default: true + default: false type: boolean conviva: description: 'Conviva' required: false - default: true + default: false type: boolean nielsen: description: 'Nielsen' @@ -46,12 +46,12 @@ on: sideloadedSubtitle: description: 'SideloadedSubtitle' required: false - default: true + default: false type: boolean uplynk: description: 'Uplynk' required: false - default: true + default: false type: boolean jobs: Bump-And-Release: From ec79b2a8d27613034b2ada16ab073f8aee19cc66 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 12:54:02 +0000 Subject: [PATCH 4/7] bump-and-release: flatten connector selection Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 36 +++++++++----------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 9d51bf57..a226cc57 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -65,31 +65,19 @@ jobs: run: | prefix="THEOplayer-Connector" connectors=() - if [[ "${{ inputs.utilities }}" == "true" ]]; then - connectors+=("$prefix-Utilities.podspec") + # Conviva and Nielsen need the new Utilities, which a dry run doesn't publish + skipUtilitiesDependents=false + if [[ "${{ inputs.dryRun }}" == "true" && "${{ inputs.utilities }}" == "true" ]]; then + skipUtilitiesDependents=true fi - if [[ "${{ inputs.comscore }}" == "true" ]]; then - connectors+=("$prefix-Comscore.podspec") - fi - if [[ "${{ inputs.conviva }}" == "true" ]]; then - if [[ "${{ inputs.dryRun }}" == "true" && "${{ inputs.utilities }}" == "true" ]]; then - echo "::notice::Skipping Conviva in dry run because the selected Utilities version is not published." - else - connectors+=("$prefix-Conviva.podspec") - fi - fi - if [[ "${{ inputs.nielsen }}" == "true" ]]; then - if [[ "${{ inputs.dryRun }}" == "true" && "${{ inputs.utilities }}" == "true" ]]; then - echo "::notice::Skipping Nielsen in dry run because the selected Utilities version is not published." - else - connectors+=("$prefix-Nielsen.podspec") - fi - fi - if [[ "${{ inputs.sideloadedSubtitle }}" == "true" ]]; then - connectors+=("$prefix-SideloadedSubtitle.podspec") - fi - if [[ "${{ inputs.uplynk }}" == "true" ]]; then - connectors+=("$prefix-Uplynk.podspec") + [[ "${{ inputs.utilities }}" == "true" ]] && connectors+=("$prefix-Utilities.podspec") + [[ "${{ inputs.comscore }}" == "true" ]] && connectors+=("$prefix-Comscore.podspec") + [[ "${{ inputs.conviva }}" == "true" && $skipUtilitiesDependents == false ]] && connectors+=("$prefix-Conviva.podspec") + [[ "${{ inputs.nielsen }}" == "true" && $skipUtilitiesDependents == false ]] && connectors+=("$prefix-Nielsen.podspec") + [[ "${{ inputs.sideloadedSubtitle }}" == "true" ]] && connectors+=("$prefix-SideloadedSubtitle.podspec") + [[ "${{ inputs.uplynk }}" == "true" ]] && connectors+=("$prefix-Uplynk.podspec") + if [[ $skipUtilitiesDependents == true && ( "${{ inputs.conviva }}" == "true" || "${{ inputs.nielsen }}" == "true" ) ]]; then + echo "::notice::Dry run with Utilities: skipping Conviva and Nielsen (new Utilities version is not published)." fi if [[ ${#connectors[@]} -eq 0 ]]; then echo "::error::Select at least one connector." From 1572cc63bcff9d2eab7f92ef0a541d68b3510261 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 13:12:57 +0000 Subject: [PATCH 5/7] bump-and-release: comma-separate connectors in run title Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index a226cc57..821f9868 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -2,15 +2,16 @@ name: Bump and release run-name: >- ${{ (inputs.version == '' && 'Not bumping version') || format('Bumping version to {0}', inputs.version) }} and ${{ (inputs.dryRun == true && 'validating') || 'releasing' }} - ${{ (inputs.utilities && inputs.comscore && inputs.conviva && inputs.nielsen && inputs.sideloadedSubtitle && inputs.uplynk && 'all connectors ') - || format('{0}{1}{2}{3}{4}{5}', - inputs.utilities && 'Utilities ' || '', - inputs.comscore && 'Comscore ' || '', - inputs.conviva && 'Conviva ' || '', - inputs.nielsen && 'Nielsen ' || '', - inputs.sideloadedSubtitle && 'SideloadedSubtitle ' || '', - inputs.uplynk && 'Uplynk ' || '') - || 'no connectors ' }}on the self hosted spec repo + ${{ (inputs.utilities && inputs.comscore && inputs.conviva && inputs.nielsen && inputs.sideloadedSubtitle && inputs.uplynk && 'all connectors') + || ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen || inputs.sideloadedSubtitle || inputs.uplynk) + && format('[{0}{1}{2}{3}{4}{5}]', + inputs.utilities && 'Utilities' || '', + inputs.comscore && (inputs.utilities && ', Comscore' || 'Comscore') || '', + inputs.conviva && ((inputs.utilities || inputs.comscore) && ', Conviva' || 'Conviva') || '', + inputs.nielsen && ((inputs.utilities || inputs.comscore || inputs.conviva) && ', Nielsen' || 'Nielsen') || '', + inputs.sideloadedSubtitle && ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen) && ', SideloadedSubtitle' || 'SideloadedSubtitle') || '', + inputs.uplynk && ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen || inputs.sideloadedSubtitle) && ', Uplynk' || 'Uplynk') || '')) + || 'no connectors' }} on the self hosted spec repo on: workflow_dispatch: inputs: From b88e14169c0cfff099ea3fa655f77cf0cf60f787 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 13:14:36 +0000 Subject: [PATCH 6/7] bump-and-release: simplify connector list in run title Co-Authored-By: raffi.manissalian --- .github/workflows/bump-and-release.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 821f9868..da9461ad 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -2,16 +2,13 @@ name: Bump and release run-name: >- ${{ (inputs.version == '' && 'Not bumping version') || format('Bumping version to {0}', inputs.version) }} and ${{ (inputs.dryRun == true && 'validating') || 'releasing' }} - ${{ (inputs.utilities && inputs.comscore && inputs.conviva && inputs.nielsen && inputs.sideloadedSubtitle && inputs.uplynk && 'all connectors') - || ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen || inputs.sideloadedSubtitle || inputs.uplynk) - && format('[{0}{1}{2}{3}{4}{5}]', + [${{ format('{0}{1}{2}{3}{4}{5}', inputs.utilities && 'Utilities' || '', inputs.comscore && (inputs.utilities && ', Comscore' || 'Comscore') || '', inputs.conviva && ((inputs.utilities || inputs.comscore) && ', Conviva' || 'Conviva') || '', inputs.nielsen && ((inputs.utilities || inputs.comscore || inputs.conviva) && ', Nielsen' || 'Nielsen') || '', inputs.sideloadedSubtitle && ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen) && ', SideloadedSubtitle' || 'SideloadedSubtitle') || '', - inputs.uplynk && ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen || inputs.sideloadedSubtitle) && ', Uplynk' || 'Uplynk') || '')) - || 'no connectors' }} on the self hosted spec repo + inputs.uplynk && ((inputs.utilities || inputs.comscore || inputs.conviva || inputs.nielsen || inputs.sideloadedSubtitle) && ', Uplynk' || 'Uplynk') || '') }}] on the self hosted spec repo on: workflow_dispatch: inputs: From 23cc2aeb5d8d0cfa0a64ee33ca83d8603bfb2a02 Mon Sep 17 00:00:00 2001 From: Raffi Manissalian Date: Thu, 19 Nov 2026 13:28:52 +0000 Subject: [PATCH 7/7] podspec-validate: resolve pods from the THEOplayer spec repo first Co-Authored-By: raffi.manissalian --- .github/workflows/podspec-validate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/podspec-validate.yml b/.github/workflows/podspec-validate.yml index 850ecb15..522b6e4b 100644 --- a/.github/workflows/podspec-validate.yml +++ b/.github/workflows/podspec-validate.yml @@ -143,6 +143,7 @@ jobs: pod lib lint "$spec" \ "${include_flag[@]}" \ + --sources="https://github.com/THEOplayer/cocoapods-specs.git,https://cdn.cocoapods.org" \ --verbose --allow-warnings done