diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml index 17aa67e8..9f9bb526 100644 --- a/.github/workflows/bump-and-release.yml +++ b/.github/workflows/bump-and-release.yml @@ -32,17 +32,18 @@ on: - Utilities - Comscore - Conviva + - Nielsen - SideloadedSubtitle - Uplynk jobs: Bump-And-Release: - runs-on: macos-14 + runs-on: macos-26 outputs: previousVersion: ${{ steps.store_previous_version.outputs.previousVersion }} steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.2.0' + xcode-version: '26.3.0' - name: Log stacks run: | echo "Log macOS version" @@ -100,10 +101,12 @@ jobs: if [[ $file == *VerizonMedia.podspec || $file == *Nielsen.podspec || $file == *Yospace.podspec ]]; then continue fi - # Conviva validation depends on Utilities being available, which does not get published in a dry run - # => skip Conviva if dry run - if [[ $file == *Conviva.podspec && ${{ inputs.dryRun }} == true ]]; then - continue + # 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 @@ -121,16 +124,26 @@ jobs: fi for connector in ${connectors[*]} do + options="--verbose --allow-warnings" if [[ "${{ inputs.selfHosted }}" == "true" ]]; then if [[ "${{ inputs.dryRun }}" != "true" ]]; then - pod repo push cocoapods-specs $connector --verbose --allow-warnings + sources="--sources=https://cdn.cocoapods.org" + if [[ $connector == *Nielsen.podspec ]]; then + sources+=",https://github.com/NielsenDigitalSDK/nielsenappsdk-ios-specs-dynamic.git" + options+=" --skip-import-validation" + fi + pod repo push cocoapods-specs $connector $options $sources else echo "dryRun -> skip selfHosted release" fi fi if [[ "${{ inputs.cocoapodsTrunk }}" == "true" ]]; then + if [[ $connector == *Nielsen.podspec ]]; then + echo "Skip Nielsen" + continue + fi pod repo update - cmd="pod $command $connector --verbose --allow-warnings" + cmd="pod $command $connector $options" if [ ${{ inputs.dryRun }} == false ]; then cmd="$cmd --synchronous" else @@ -146,11 +159,11 @@ jobs: Cleanup: needs: Bump-And-Release if: (inputs.dryRun == true && inputs.version != '') && (success() || failure()) - runs-on: macos-14 + runs-on: macos-26 steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.2.0' + xcode-version: '26.3.0' - name: Check out repository code uses: actions/checkout@v4 with: diff --git a/.github/workflows/podspec-validate.yml b/.github/workflows/podspec-validate.yml index 1272a77e..850ecb15 100644 --- a/.github/workflows/podspec-validate.yml +++ b/.github/workflows/podspec-validate.yml @@ -12,12 +12,12 @@ run-name: Validating CocoaPods jobs: cocoapods-validate: - runs-on: macos-14 + runs-on: macos-26 steps: - uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.2.0' + xcode-version: '26.3.0' - name: Log environment run: | echo "macOS:" && sw_vers