From 1442386914a6464134d86b38fb12f718e60ae8b1 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 10 Feb 2023 11:21:12 -0500 Subject: [PATCH] Stop installing openssl in Darwin CI. (#24950) Now that https://github.com/project-chip/connectedhomeip/pull/24929 is merged, openssl is not needed for Darwin. --- .github/workflows/build.yaml | 10 ---------- .github/workflows/darwin-tests.yaml | 10 +--------- .github/workflows/darwin.yaml | 10 +--------- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 10 +--------- .github/workflows/tests.yaml | 20 ++------------------ 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8a847a3e034df6..012b054a929a99 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml index 7d1db5f479dc6c..0dcf3fbcec8732 100644 --- a/.github/workflows/darwin-tests.yaml +++ b/.github/workflows/darwin-tests.yaml @@ -56,7 +56,7 @@ 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. @@ -64,14 +64,6 @@ jobs: 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/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml index fb29e67cd0ce98..a2496446e3d8c8 100644 --- a/.github/workflows/darwin.yaml +++ b/.github/workflows/darwin.yaml @@ -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 python@3.9 - - name: Fix pkgconfig link - working-directory: /usr/local/lib/pkgconfig - run: | - pwd - ls -la /usr/local/Cellar/ - ls -la /usr/local/Cellar/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . + run: brew install python@3.9 - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 7a90b9ebe36942..222b01cee31880 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -70,7 +70,7 @@ jobs: .environment/gn_out/.ninja_log .environment/pigweed-venv/*.log - name: Build examples - timeout-minutes: 40 + timeout-minutes: 50 run: | scripts/run_in_build_env.sh "\ ./scripts/build/build_examples.py \ diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 3f8e0424010bf5..eb3d222d4c7ee9 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -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/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index d13d8d977a5ffd..e0f6a5d90c83a5 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -306,7 +306,7 @@ 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. @@ -314,14 +314,6 @@ jobs: 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/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh @@ -585,7 +577,7 @@ 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. @@ -593,14 +585,6 @@ jobs: 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/openssl@1.1 - OPEN_SSL_VERSION=`ls -la /usr/local/Cellar/openssl@1.1 | cat | tail -n1 | awk '{print $NF}'` - ln -s /usr/local/Cellar/openssl@1.1/$OPEN_SSL_VERSION/lib/pkgconfig/* . - name: Bootstrap timeout-minutes: 25 run: scripts/build/gn_bootstrap.sh