Skip to content

Commit 2b212a3

Browse files
authored
boringSSL clone specific commit (#485)
Clone the boringSSL sources to a specific commit, instead of cloning the repo first and then checking out a commit. This frees up enough disk space that we no longer need to copy the resulting artifacts over to the C drive on Windows hosts in order to make enough room for the google cloud sdk installation. Therefore I've removed that step from the CI saving up to 20 minutes per windows integration test build.
1 parent 4982bc4 commit 2b212a3

File tree

2 files changed

+8
-34
lines changed

2 files changed

+8
-34
lines changed

.github/workflows/integration_tests.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -326,35 +326,6 @@ jobs:
326326
shell: bash
327327
run: |
328328
rm -rf testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}
329-
- name: Configure GCS Upload Directory (Linux, macOS)
330-
if: (startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')) && !cancelled()
331-
shell: bash
332-
run: echo "GCS_UPLOAD_DIR=${{ github.workspace }}" >> $GITHUB_ENV
333-
- name: Configure GCS Upload Directory (Windows)
334-
# For Windows move the uploads to C: to create enough space for the
335-
# Cloud SDK installation on D:.
336-
if: startsWith(matrix.os, 'windows') && !cancelled()
337-
shell: bash
338-
run: echo "GCS_UPLOAD_DIR=/c/fpl-upload" >> $GITHUB_ENV
339-
- name: Move GCS Artifacts to GCS Upload Dir
340-
# Copy the artifacts and also the upload scripts since python's relpath
341-
# produces errors when called across two different drives. Use tar to
342-
# move the files as it neatly deepcopies firestore's symlinks.
343-
if: ${{ (env.GCS_UPLOAD_DIR != github.workspace) && !cancelled() }}
344-
shell: bash
345-
run: |
346-
set -x
347-
mkdir -p ${{env.GCS_UPLOAD_DIR}}/scripts/gha/integration_testing
348-
mkdir -p ${{env.GCS_UPLOAD_DIR}}/scripts/gha-encrypted
349-
# The ta directory contains the integration testapps to archive.
350-
tar -chf ${{env.GCS_UPLOAD_DIR}}/ta.tar ta
351-
rm -rf ta
352-
tar xf ${{env.GCS_UPLOAD_DIR}}/ta.tar -C ${{env.GCS_UPLOAD_DIR}}
353-
rm ${{env.GCS_UPLOAD_DIR}}/ta.tar
354-
cp scripts/gha/gcs_uploader.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha-encrypted/
355-
cp scripts/gha/integration_testing/gcs.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha/integration_testing/
356-
cp scripts/gha/gcs_uploader.py ${{env.GCS_UPLOAD_DIR}}/scripts/gha/
357-
cp scripts/gha-encrypted/gcs_key_file.json ${{env.GCS_UPLOAD_DIR}}//scripts/gha-encrypted/
358329
- name: Set CLOUDSDK_PYTHON (Windows)
359330
shell: bash
360331
if: startsWith(matrix.os, 'windows') && !cancelled()
@@ -366,9 +337,7 @@ jobs:
366337
shell: bash
367338
if: ${{ !cancelled() }}
368339
run: |
369-
pushd ${{env.GCS_UPLOAD_DIR}}
370340
python scripts/gha/gcs_uploader.py --testapp_dir ta --key_file scripts/gha-encrypted/gcs_key_file.json
371-
popd
372341
- name: Download log artifacts
373342
if: ${{ needs.check_trigger.outputs.should_update_pr && failure() && !cancelled() }}
374343
uses: actions/[email protected]

cmake/external/boringssl.cmake

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@ endif()
2121
set(patch_file
2222
${CMAKE_CURRENT_LIST_DIR}/../../scripts/git/patches/boringssl/0001-disable-C4255-converting-empty-params-to-void.patch)
2323

24+
set(commit_tag 83da28a68f32023fd3b95a8ae94991a07b1f6c62)
25+
2426
ExternalProject_Add(
2527
boringssl
28+
29+
DOWNLOAD_COMMAND
30+
COMMAND git init boringssl
31+
COMMAND cd boringssl && git fetch --depth=1 https://github.com/google/boringssl ${commit_tag} && git reset --hard FETCH_HEAD
2632

27-
GIT_REPOSITORY https://github.com/google/boringssl/
28-
GIT_TAG 83da28a68f32023fd3b95a8ae94991a07b1f6c62
29-
PATCH_COMMAND git apply ${patch_file}
33+
PATCH_COMMAND git apply ${patch_file} && git gc --aggressive
3034
PREFIX ${PROJECT_BINARY_DIR}
3135
CONFIGURE_COMMAND ""
3236
BUILD_COMMAND ""
3337
INSTALL_COMMAND ""
3438
TEST_COMMAND ""
3539
)
40+

0 commit comments

Comments
 (0)