Skip to content

Commit 82350f1

Browse files
authored
Disable vcpkg and remove homebrew update (#1078)
* Update vcpkg * Update build_desktop.py * Remove the logic to update homebrew
1 parent 627e624 commit 82350f1

File tree

5 files changed

+2
-50
lines changed

5 files changed

+2
-50
lines changed

.github/workflows/android.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,6 @@ jobs:
110110
rm -rf /tmp/android-ndk-r21e
111111
fi
112112
113-
- name: Update homebrew (avoid bintray errors)
114-
uses: nick-invision/retry@v2
115-
if: startsWith(matrix.os, 'macos')
116-
with:
117-
timeout_minutes: 10
118-
max_attempts: 3
119-
command: |
120-
# Temporarily here until Github runners have updated their version of
121-
# homebrew. This prevents errors arising from the shut down of
122-
# binutils, used by older version of homebrew for hosting packages.
123-
brew update
124-
125113
- name: Install prerequisites
126114
shell: bash
127115
run: |

.github/workflows/cpp-packaging.yml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -401,18 +401,6 @@ jobs:
401401
with:
402402
python-version: ${{ matrix.python_version }}
403403

404-
- name: Update homebrew (avoid bintray errors)
405-
uses: nick-invision/retry@v2
406-
if: runner.os == 'macOS'
407-
with:
408-
timeout_minutes: 10
409-
max_attempts: 3
410-
command: |
411-
# Temporarily here until Github runners have updated their version of
412-
# homebrew. This prevents errors arising from the shut down of
413-
# binutils, used by older version of homebrew for hosting packages.
414-
brew update
415-
416404
- name: Install Desktop SDK prerequisites
417405
uses: nick-invision/retry@v2
418406
with:
@@ -532,18 +520,6 @@ jobs:
532520
with:
533521
python-version: 3.7
534522

535-
- name: Update homebrew (avoid bintray errors)
536-
uses: nick-invision/retry@v2
537-
if: runner.os == 'macOS'
538-
with:
539-
timeout_minutes: 10
540-
max_attempts: 3
541-
command: |
542-
# Temporarily here until Github runners have updated their version of
543-
# homebrew. This prevents errors arising from the shut down of
544-
# binutils, used by older version of homebrew for hosting packages.
545-
brew update
546-
547523
- name: Install prerequisites
548524
run: |
549525
cd sdk-src

.github/workflows/desktop.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,6 @@ jobs:
168168
python-version: ${{ matrix.python_version }}
169169
architecture: 'x64'
170170

171-
- name: Update homebrew (avoid bintray errors)
172-
uses: nick-invision/retry@v2
173-
if: startsWith(matrix.os, 'macos')
174-
with:
175-
timeout_minutes: 10
176-
max_attempts: 3
177-
command: |
178-
# Temporarily here until Github runners have updated their version of
179-
# homebrew. This prevents errors arising from the shut down of
180-
# binutils, used by older version of homebrew for hosting packages.
181-
brew update
182-
183171
- name: Install Desktop SDK prerequisites
184172
uses: nick-invision/retry@v2
185173
with:

external/vcpkg

Submodule vcpkg updated 4367 files

scripts/gha/build_desktop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def parse_cmdline_args():
278278
parser.add_argument('--build_dir', default='build', help='Output build directory')
279279
parser.add_argument('--build_tests', action='store_true', help='Build unit tests too')
280280
parser.add_argument('--verbose', action='store_true', help='Enable verbose CMake builds.')
281-
parser.add_argument('--disable_vcpkg', action='store_true', help='Disable vcpkg and just use CMake.')
281+
parser.add_argument('--disable_vcpkg', default='True', action='store_true', help='Disable vcpkg and just use CMake.')
282282
parser.add_argument('--vcpkg_step_only', action='store_true', help='Just install cpp packages using vcpkg and exit.')
283283
parser.add_argument('--config', default='Release', help='Release/Debug config')
284284
parser.add_argument('--target', nargs='+', help='A list of CMake build targets (eg: firebase_app firebase_auth)')

0 commit comments

Comments
 (0)