reverting changes to workflow files

Waiting for simulation tests to run on Github
before including tvos in build and packaging.

Author: vimanyu

.github/workflows/cpp-packaging.yml

@@ -156,20 +156,15 @@ jobs:
         with:
           path: sdk-src
 
-      - name: Setup python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.7
-
       - name: install prerequisites
         run: sdk-src/build_scripts/ios/install_prereqs.sh
 
       - name: build sdk
         run: |
-          python sdk-src/scripts/gha/build_ios_tvos.py -b firebase-cpp-sdk-ios-tvos-build -s sdk-src
-          sdk-src/build_scripts/ios/package.sh firebase-cpp-sdk-ios-tvos-build firebase-cpp-sdk-ios-tvos-package
-          cd firebase-cpp-sdk-ios-tvos-package
-          tar -czhf ../firebase-cpp-sdk-ios-tvos-package.tgz .
+          sdk-src/build_scripts/ios/build.sh -b firebase-cpp-sdk-ios-build -s sdk-src
+          sdk-src/build_scripts/ios/package.sh firebase-cpp-sdk-ios-build firebase-cpp-sdk-ios-package
+          cd firebase-cpp-sdk-ios-package
+          tar -czhf ../firebase-cpp-sdk-ios-package.tgz .
 
       - name: Print built libraries
         shell: bash
@@ -189,8 +184,8 @@ jobs:
       - name: upload artifacts
         uses: actions/[email protected]
         with:
-          name: firebase-cpp-sdk-ios-tvos-package
-          path: firebase-cpp-sdk-ios-tvos-package.tgz
+          name: firebase-cpp-sdk-ios-package
+          path: firebase-cpp-sdk-ios-package.tgz
 
   build_and_package_android:
     name: build-and-package-android-${{matrix.stl}}
@@ -356,7 +351,7 @@ jobs:
       # Run the build in the host OS default shell since Windows can't handle long path names in bash.
       - name: Build desktop SDK
         run: |
-          python scripts/gha/build_desktop.py --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --linux_abi "${{ matrix.linux_abi }}" --build_dir out-sdk ${VERBOSE_FLAG} ${{ matrix.additional_build_flags }}
+          python scripts/gha/build_desktop.py --arch "${{ matrix.architecture }}" --config "${{ matrix.build_type }}" --msvc_runtime_library "${{ matrix.msvc_runtime }}" --linux_abi "${{ matrix.linux_abi }}" --build_dir out-sdk ${VERBOSE_FLAG} ${{ matrix.additional_build_flags }} --gha_build
 
       - name: Archive SDK
         shell: bash

.github/workflows/ios.yml

@@ -55,4 +55,4 @@ jobs:
 
       - name: Build SDK
         run: |
-          python scripts/gha/build_ios_tvos.py -b ios_tvos_build -s .
+          build_scripts/ios/build.sh -b ios_build -s .