Skip to content

Commit e67e818

Browse files
authored
[PM-18414] CI restructuring #3 - Add Brewfile with version pinning (#1525)
1 parent 6b72644 commit e67e818

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

.github/workflows/build-bwa.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,10 @@ jobs:
131131
with:
132132
bundler-cache: true
133133

134-
- name: Install Mint, protobuf, xcbeautify, and yq
134+
- name: Install Homebrew Dependencies
135135
run: |
136-
brew install mint swift-protobuf xcbeautify yq
136+
brew update
137+
brew bundle
137138
138139
- name: Install Mint packages
139140
if: steps.mint-cache.outputs.cache-hit != 'true'

.github/workflows/build.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,18 +333,10 @@ jobs:
333333
with:
334334
bundler-cache: true
335335

336-
- name: Update homebrew
336+
- name: Install Homebrew Dependencies
337337
run: |
338338
brew update
339-
340-
- name: Install Fastlane
341-
if: env._BUILD_MODE == 'Device'
342-
run: |
343-
brew install fastlane
344-
345-
- name: Install Mint
346-
run: |
347-
brew install mint
339+
brew bundle
348340
349341
- name: Install Mint packages
350342
if: steps.mint-cache.outputs.cache-hit != 'true'

.github/workflows/test-bwa.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ jobs:
119119
run: |
120120
./Scripts-bwa/update_test_local_config.sh "${{ env._COMPILER_FLAGS }}"
121121
122-
- name: Install Mint, protobuf, and xcresultparser
122+
- name: Install Homebrew Dependencies and run bootstrap.sh
123123
run: |
124-
brew install mint swift-protobuf xcresultparser
124+
brew update
125+
brew bundle
125126
./Scripts/bootstrap.sh
126127
127128
- name: Build and test

.github/workflows/test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,10 @@ jobs:
114114
run: |
115115
./Scripts/update_test_local_config.sh "${{ env._COMPILER_FLAGS }}"
116116
117-
- name: Install Mint and xcresultparser
117+
- name: Install Homebrew Dependencies and run bootstrap.sh
118118
run: |
119-
brew install mint xcresultparser
119+
brew update
120+
brew bundle
120121
./Scripts/bootstrap.sh
121122
122123
- name: Build and test

Brewfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
brew "fastlane"
2+
brew "mint"
3+
brew "swift-protobuf" # used by Bitwarden Authenticator
4+
5+
if ENV["CI"]
6+
brew "yq"
7+
brew "xcresultparser"
8+
end

Scripts/bootstrap.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -euo pipefail
44

5+
brew bundle check # use --verbose to list missing dependencies
6+
57
mint bootstrap
68

79
# Handle script being called from repo root or Scripts folder

0 commit comments

Comments
 (0)