Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
env:
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
GITHUB_TOKEN: ${{ github.token }}
xcodeVersion: "12.4" # Only affects Mac runners, and only for prerequisites.
xcodeVersion: "13.1" # Only affects Mac runners, and only for prerequisites.

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ env:
demumbleVer: "1.1.0"
# Use SHA256 for hashing files.
hashCommand: "sha256sum"
# Xcode version 12.4 is the version we build the SDK with.
# Xcode version 13.1 is the version we build the SDK with.
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
xcodeVersion: "12.4"
xcodeVersion: "13.1"
# LLVM version with ARM MachO support has no version number yet.
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
GITHUB_TOKEN: ${{ github.token }}
Expand Down Expand Up @@ -79,13 +79,13 @@ jobs:
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-12]
include:
- os: ubuntu-latest
tools_platform: linux
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
- os: macos-latest
- os: macos-12
tools_platform: darwin
# Binutils 2.35.1 released Sep 19, 2020
binutils_version: "2.35.1"
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:

build_and_package_ios_tvos:
name: build-and-package-ios-tvos
runs-on: macos-latest
runs-on: macos-12
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
steps:
- name: Store git credentials for all git commands
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [windows-latest, ubuntu-latest, macos-latest]
os: [windows-latest, ubuntu-latest, macos-12]
build_type: ["Release", "Debug"]
architecture: ["x64", "x86", "arm64"]
msvc_runtime: ["static", "dynamic"]
Expand All @@ -322,21 +322,21 @@ jobs:
vcpkg_triplet_suffix: "linux"
additional_build_flags: ""
sdk_platform: "linux"
- os: macos-latest
- os: macos-12
vcpkg_triplet_suffix: "osx"
additional_build_flags: "--target_format libraries"
sdk_platform: "darwin"

exclude:
- os: windows-latest
linux_abi: "c++11"
- os: macos-latest
- os: macos-12
architecture: "x86"
- os: macos-latest
- os: macos-12
msvc_runtime: "dynamic"
- os: macos-latest
- os: macos-12
linux_abi: "c++11"
- os: macos-latest
- os: macos-12
build_type: "Debug"
- os: ubuntu-latest
msvc_runtime: "dynamic"
Expand Down Expand Up @@ -497,7 +497,7 @@ jobs:
suffix: '-x64-Debug-dynamic'
runs_on_platform: ubuntu-latest
- sdk_platform: darwin
runs_on_platform: macos-latest
runs_on_platform: macos-12
exclude:
- sdk_platform: windows
suffix: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ jobs:
# msvc_runtime excludes
- os: ubuntu-latest
msvc_runtime: "dynamic"
- os: macos-latest
- os: macos-12
msvc_runtime: "dynamic"
# architecture excluees
- os: macos-latest
- os: macos-12
architecture: "x86"
# Xcode excludes -- allow only one on osx and linux
- os: ubuntu-latest
Expand Down
66 changes: 33 additions & 33 deletions .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
required: true
operating_systems:
description: 'CSV of VMs to run on'
default: 'ubuntu-latest,windows-latest,macos-latest'
default: 'ubuntu-latest,windows-latest,macos-12'
required: true
desktop_ssl_variants:
description: 'CSV of desktop SSL variants to use'
Expand Down Expand Up @@ -534,7 +534,7 @@ jobs:
build_ios:
name: build-ios-macos-latest
needs: [check_and_prepare]
runs-on: macos-latest
runs-on: macos-12
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() && !failure()
strategy:
fail-fast: false
Expand Down Expand Up @@ -599,30 +599,30 @@ jobs:
--t ${{ needs.check_and_prepare.outputs.apis }} \
--output_directory "${{ github.workspace }}" \
--ios_sdk ${{ needs.check_and_prepare.outputs.mobile_test_on }} \
--artifact_name "ios-macos-latest" \
--artifact_name "ios-macos-12" \
--noadd_timestamp \
--short_output_paths \
${additional_flags[*]}
- name: Prepare results summary artifact
if: ${{ !cancelled() }}
shell: bash
run: |
if [ ! -f build-results-ios-macos-latest.log.json ]; then
echo "__SUMMARY_MISSING__" > build-results-ios-macos-latest.log.json
if [ ! -f build-results-ios-macos-12.log.json ]; then
echo "__SUMMARY_MISSING__" > build-results-ios-macos-12.log.json
fi
- name: Upload iOS integration tests artifact
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: testapps-ios-macos-latest
path: testapps-ios-macos-latest
name: testapps-ios-macos-12
path: testapps-ios-macos-12
retention-days: ${{ env.artifactRetentionDays }}
- name: Upload iOS build results artifact
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: log-artifact
path: build-results-ios-macos-latest*
path: build-results-ios-macos-12*
retention-days: ${{ env.artifactRetentionDays }}
- name: Download log artifacts
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
Expand All @@ -643,15 +643,15 @@ jobs:
if: ${{ !cancelled() }}
shell: bash
run: |
cat build-results-ios-macos-latest.log
cat build-results-ios-macos-12.log
if [[ "${{ job.status }}" != "success" ]]; then
exit 1
fi

build_tvos:
name: build-tvos-macos-latest
needs: [check_and_prepare]
runs-on: macos-latest
runs-on: macos-12
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() && !failure()
strategy:
fail-fast: false
Expand Down Expand Up @@ -715,30 +715,30 @@ jobs:
python scripts/gha/build_testapps.py --p tvOS \
--t ${{ needs.check_and_prepare.outputs.apis }} \
--output_directory "${{ github.workspace }}" \
--artifact_name "tvos-macos-latest" \
--artifact_name "tvos-macos-12" \
--noadd_timestamp \
--short_output_paths \
${additional_flags[*]}
- name: Prepare results summary artifact
if: ${{ !cancelled() }}
shell: bash
run: |
if [ ! -f build-results-tvos-macos-latest.log.json ]; then
echo "__SUMMARY_MISSING__" > build-results-tvos-macos-latest.log.json
if [ ! -f build-results-tvos-macos-12.log.json ]; then
echo "__SUMMARY_MISSING__" > build-results-tvos-macos-12.log.json
fi
- name: Upload tvOS integration tests artifact
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: testapps-tvos-macos-latest
path: testapps-tvos-macos-latest
name: testapps-tvos-macos-12
path: testapps-tvos-macos-12
retention-days: ${{ env.artifactRetentionDays }}
- name: Upload tvOS build results artifact
uses: actions/upload-artifact@v3
if: ${{ !cancelled() }}
with:
name: log-artifact
path: build-results-tvos-macos-latest*
path: build-results-tvos-macos-12*
retention-days: ${{ env.artifactRetentionDays }}
- name: Download log artifacts
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
Expand All @@ -759,7 +759,7 @@ jobs:
if: ${{ !cancelled() }}
shell: bash
run: |
cat build-results-tvos-macos-latest.log
cat build-results-tvos-macos-12.log
if [[ "${{ job.status }}" != "success" ]]; then
exit 1
fi
Expand Down Expand Up @@ -858,7 +858,7 @@ jobs:
test_android:
name: test-android-${{ matrix.build_os }}-${{ matrix.android_device }}
needs: [check_and_prepare, build_android]
runs-on: macos-latest
runs-on: macos-12
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Android') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
strategy:
fail-fast: false
Expand Down Expand Up @@ -963,7 +963,7 @@ jobs:
test_ios:
name: test-ios-macos-latest-${{ matrix.ios_device }}
needs: [check_and_prepare, build_ios]
runs-on: macos-latest
runs-on: macos-12
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
strategy:
fail-fast: false
Expand All @@ -980,7 +980,7 @@ jobs:
uses: actions/download-artifact@v3
with:
path: testapps
name: testapps-ios-macos-latest
name: testapps-ios-macos-12
- name: Setup python
uses: actions/setup-python@v2
with:
Expand Down Expand Up @@ -1009,7 +1009,7 @@ jobs:
run: |
python scripts/gha/test_simulator.py --testapp_dir testapps \
--ios_device "${{ matrix.ios_device }}" \
--logfile_name "ios-macos-latest-${{ matrix.ios_device }}" \
--logfile_name "ios-macos-12-${{ matrix.ios_device }}" \
--ci
- name: Install Cloud SDK
if: steps.get-device-type.outputs.device_type == 'real'
Expand All @@ -1022,23 +1022,23 @@ jobs:
python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
python scripts/gha/test_lab.py --testapp_dir testapps \
--ios_device "${{ matrix.ios_device }}" \
--logfile_name "ios-macos-latest-${{ matrix.ios_device }}" \
--logfile_name "ios-macos-12-${{ matrix.ios_device }}" \
--code_platform cpp \
--key_file scripts/gha-encrypted/gcs_key_file.json
- name: Prepare results summary artifact
if: ${{ !cancelled() }}
shell: bash
run: |
# If testapps do not exist, then it's a build error not test error.
if [ -d "testapps/testapps-ios-macos-latest" && ! -f "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json" ]; then
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json"
if [ -d "testapps/testapps-ios-macos-12" && ! -f "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log.json" ]; then
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log.json"
fi
- name: Upload iOS test results artifact
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v3
with:
name: log-artifact
path: testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}*
path: testapps/test-results-ios-macos-12-${{ matrix.ios_device }}*
retention-days: ${{ env.artifactRetentionDays }}
- name: Download log artifacts
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
Expand All @@ -1059,15 +1059,15 @@ jobs:
if: ${{ !cancelled() }}
shell: bash
run: |
cat "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log"
cat "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log"
if [[ "${{ job.status }}" != "success" ]]; then
exit 1
fi

test_tvos:
name: test-tvos-macos-latest-${{ matrix.tvos_device }}
needs: [check_and_prepare, build_tvos]
runs-on: macos-latest
runs-on: macos-12
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
strategy:
fail-fast: false
Expand All @@ -1084,7 +1084,7 @@ jobs:
uses: actions/download-artifact@v3
with:
path: testapps
name: testapps-tvos-macos-latest
name: testapps-tvos-macos-12
- name: Setup python
uses: actions/setup-python@v2
with:
Expand All @@ -1105,22 +1105,22 @@ jobs:
run: |
python scripts/gha/test_simulator.py --testapp_dir testapps \
--tvos_device "${{ matrix.tvos_device }}" \
--logfile_name "tvos-macos-latest-${{ matrix.tvos_device }}" \
--logfile_name "tvos-macos-12-${{ matrix.tvos_device }}" \
--ci
- name: Prepare results summary artifact
if: ${{ !cancelled() }}
shell: bash
run: |
# If testapps do not exist, then it's a build error not test error.
if [ -d "testapps/testapps-tvos-macos-latest" && ! -f "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json" ]; then
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json"
if [ -d "testapps/testapps-tvos-macos-12" && ! -f "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log.json" ]; then
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log.json"
fi
- name: Upload tvOS test results artifact
if: ${{ !cancelled() }}
uses: actions/upload-artifact@v3
with:
name: log-artifact
path: testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}*
path: testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}*
retention-days: ${{ env.artifactRetentionDays }}
- name: Download log artifacts
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
Expand All @@ -1141,7 +1141,7 @@ jobs:
if: ${{ !cancelled() }}
shell: bash
run: |
cat "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log"
cat "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log"
if [[ "${{ job.status }}" != "success" ]]; then
exit 1
fi
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ jobs:
echo "::set-output name=matrix_xcode_version::$( python scripts/gha/print_matrix_configuration.py -w ios -k xcode_version ${EXPANDED_MATRIX_PARAM} )"

build:
name: ios-macos-latest
runs-on: macos-latest
name: ios-${{ matrix.os }}-${{ matrix.xcode_version }}
runs-on: ${{ matrix.os }}
needs: prepare_matrix
strategy:
fail-fast: false
matrix:
xcode_verison: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
os: [ 'macos-12' ]
xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
steps:
- name: Store git credentials for all git commands
# Forces all git commands to use authenticated https, to prevent throttling.
Expand All @@ -52,7 +53,7 @@ jobs:

- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_verison }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer

- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
jobs:
update_dependencies:
name: update-deps
runs-on: macos-latest
runs-on: macos-12
steps:
- name: Get token for firebase-workflow-trigger
uses: tibdex/github-app-token@v1
Expand Down
Loading