-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Stop installing openssl in Darwin CI. (#24950)
Now that #24929 is merged, openssl is not needed for Darwin.
- Loading branch information
1 parent
fbae6ed
commit 1336036
Showing
6 changed files
with
6 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -369,19 +369,9 @@ jobs: | |
# languages: "cpp" | ||
- name: Checkout submodules | ||
run: scripts/checkout_submodules.py --shallow --platform darwin | ||
- name: Setup Environment | ||
run: brew install openssl pkg-config | ||
- name: Try to ensure the directory for diagnostic log collection exists | ||
run: | | ||
mkdir -p ~/Library/Logs/DiagnosticReports || true | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,22 +56,14 @@ jobs: | |
run: scripts/checkout_submodules.py --shallow --platform darwin | ||
- name: Setup Environment | ||
# coreutils for stdbuf | ||
run: brew install openssl pkg-config coreutils | ||
run: brew install coreutils | ||
- name: | ||
Try to ensure the directories for core dumping and diagnostic | ||
log collection exist and we can write them. | ||
run: | | ||
sudo chown ${USER} /cores || true | ||
mkdir -p ~/Library/Logs/DiagnosticReports || true | ||
mkdir objdir-clone || true | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -43,15 +43,7 @@ jobs: | |
- name: Checkout submodules | ||
run: scripts/checkout_submodules.py --shallow --platform darwin | ||
- name: Setup Environment | ||
run: brew install openssl pkg-config [email protected] | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
run: brew install [email protected] | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,18 +99,10 @@ jobs: | |
attempt_limit: 3 | ||
attempt_delay: 2000 | ||
- name: Setup Environment | ||
run: brew install openssl pkg-config llvm | ||
run: brew install llvm | ||
- name: Try to ensure the objdir-clone dir exists | ||
run: | | ||
mkdir objdir-clone || true | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -306,22 +306,14 @@ jobs: | |
run: scripts/checkout_submodules.py --shallow --platform darwin | ||
- name: Setup Environment | ||
# coreutils for stdbuf | ||
run: brew install openssl pkg-config coreutils | ||
run: brew install coreutils | ||
- name: | ||
Try to ensure the directories for core dumping and diagnostic | ||
log collection exist and we can write them. | ||
run: | | ||
sudo chown ${USER} /cores || true | ||
mkdir -p ~/Library/Logs/DiagnosticReports || true | ||
mkdir objdir-clone || true | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|
@@ -585,22 +577,14 @@ jobs: | |
run: scripts/checkout_submodules.py --shallow --platform darwin | ||
- name: Setup Environment | ||
# coreutils for stdbuf | ||
run: brew install openssl pkg-config coreutils | ||
run: brew install coreutils | ||
- name: | ||
Try to ensure the directories for core dumping and diagnostic | ||
log collection exist and we can write them. | ||
run: | | ||
sudo chown ${USER} /cores || true | ||
mkdir -p ~/Library/Logs/DiagnosticReports || true | ||
mkdir objdir-clone || true | ||
- name: Fix pkgconfig link | ||
working-directory: /usr/local/lib/pkgconfig | ||
run: | | ||
pwd | ||
ls -la /usr/local/Cellar/ | ||
ls -la /usr/local/Cellar/[email protected] | ||
OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/[email protected] | cat | tail -n1 | awk '{print $NF}'` | ||
ln -s /usr/local/Cellar/[email protected]/$OPEN_SSL_VERSION/lib/pkgconfig/* . | ||
- name: Bootstrap | ||
timeout-minutes: 25 | ||
run: scripts/build/gn_bootstrap.sh | ||
|