Skip to content

Commit d78b668

Browse files
authored
Use s3 for sccache in ASV related builds (#2657)
#### Reference Issues/PRs Monday ticket ref: 10079294063 #### What does this implement or fix? Changed the ASV builds to use S3 for sccache as is done in the regular builds. Also fixes the [VCPKG caching in one of the builds](https://github.com/man-group/ArcticDB/pull/2657/files#diff-8f568f466457a96303cbb4eed3d01446c3d3e5f8e522f58ffa4e78a13f04d64eR164). Tested manually in [this build](https://github.com/man-group/ArcticDB/actions/runs/17821717217/job/50665565352). #### Any other comments? #### Checklist <details> <summary> Checklist for code changes... </summary> - [ ] Have you updated the relevant docstrings, documentation and copyright notice? - [ ] Is this contribution tested against [all ArcticDB's features](../docs/mkdocs/docs/technical/contributing.md)? - [ ] Do all exceptions introduced raise appropriate [error messages](https://docs.arcticdb.io/error_messages/)? - [ ] Are API changes highlighted in the PR description? - [ ] Is the PR labelled as enhancement or bug so it appears in autogenerated release notes? </details> <!-- Thanks for contributing a Pull Request to ArcticDB! Please ensure you have taken a look at: - ArcticDB's Code of Conduct: https://github.com/man-group/ArcticDB/blob/master/CODE_OF_CONDUCT.md - ArcticDB's Contribution Licensing: https://github.com/man-group/ArcticDB/blob/master/docs/mkdocs/docs/technical/contributing.md#contribution-licensing -->
1 parent 59551d3 commit d78b668

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

.github/workflows/analysis_workflow.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,19 @@ jobs:
128128
runs-on: ubuntu-latest
129129
container: ghcr.io/man-group/arcticdb-dev:${{ inputs.dev_image_tag || 'latest' }}
130130
env:
131-
SCCACHE_GHA_VERSION: ${{vars.SCCACHE_GHA_VERSION || 1}} # Setting this env var enables the caching
131+
# 0 - uses S3 Cache, 1 - uses GHA cache
132+
# this way the external PRs can use the GHA cache
133+
SCCACHE_GHA_VERSION: ${{secrets.AWS_S3_ACCESS_KEY == null}}
134+
SCCACHE_BUCKET: arcticdb-ci-sccache-bucket
135+
SCCACHE_ENDPOINT: http://s3.eu-west-1.amazonaws.com
136+
SCCACHE_REGION: eu-west-1
137+
SCCACHE_S3_USE_SSL: false
138+
AWS_ACCESS_KEY_ID: ${{secrets.AWS_S3_ACCESS_KEY}}
139+
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_S3_SECRET_KEY}}
132140
VCPKG_NUGET_USER: ${{secrets.VCPKG_NUGET_USER || github.repository_owner}}
133141
VCPKG_NUGET_TOKEN: ${{secrets.VCPKG_NUGET_TOKEN || secrets.GITHUB_TOKEN}}
142+
VCPKG_MAN_NUGET_USER: ${{secrets.VCPKG_MAN_NUGET_USER}} # For forks to download pre-compiled dependencies from the Man repo
143+
VCPKG_MAN_NUGET_TOKEN: ${{secrets.VCPKG_MAN_NUGET_TOKEN}}
134144
CMAKE_C_COMPILER_LAUNCHER: sccache
135145
CMAKE_CXX_COMPILER_LAUNCHER: sccache
136146
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
@@ -151,7 +161,8 @@ jobs:
151161
- name: Extra envs
152162
shell: bash -l {0}
153163
run: |
154-
. build_tooling/vcpkg_caching.sh # Linux follower needs another call in CIBW
164+
. build_tooling/prep_cpp_build.sh
165+
. build_tooling/vcpkg_caching.sh
155166
echo -e "VCPKG_BINARY_SOURCES=$VCPKG_BINARY_SOURCES
156167
VCPKG_ROOT=$PLATFORM_VCPKG_ROOT" | tee -a $GITHUB_ENV
157168
cmake -P cpp/CMake/CpuCount.cmake | sed 's/^-- //' | tee -a $GITHUB_ENV

.github/workflows/benchmark_commits.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,19 @@ jobs:
2525
container: ghcr.io/man-group/arcticdb-dev:${{ inputs.dev_image_tag }}
2626
env:
2727
# this is potentially overflowing the cache, so should be looked into after we address issue #1057
28-
SCCACHE_GHA_VERSION: ${{vars.SCCACHE_GHA_VERSION || 1}} # Setting this env var enables the caching
28+
# 0 - uses S3 Cache, 1 - uses GHA cache
29+
# this way the external PRs can use the GHA cache
30+
SCCACHE_GHA_VERSION: ${{secrets.AWS_S3_ACCESS_KEY == null}}
31+
SCCACHE_BUCKET: arcticdb-ci-sccache-bucket
32+
SCCACHE_ENDPOINT: http://s3.eu-west-1.amazonaws.com
33+
SCCACHE_REGION: eu-west-1
34+
SCCACHE_S3_USE_SSL: false
35+
AWS_ACCESS_KEY_ID: ${{secrets.AWS_S3_ACCESS_KEY}}
36+
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_S3_SECRET_KEY}}
2937
VCPKG_NUGET_USER: ${{secrets.VCPKG_NUGET_USER || github.repository_owner}}
3038
VCPKG_NUGET_TOKEN: ${{secrets.VCPKG_NUGET_TOKEN || secrets.GITHUB_TOKEN}}
39+
VCPKG_MAN_NUGET_USER: ${{secrets.VCPKG_MAN_NUGET_USER}} # For forks to download pre-compiled dependencies from the Man repo
40+
VCPKG_MAN_NUGET_TOKEN: ${{secrets.VCPKG_MAN_NUGET_TOKEN}}
3141
CMAKE_C_COMPILER_LAUNCHER: sccache
3242
CMAKE_CXX_COMPILER_LAUNCHER: sccache
3343
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

.github/workflows/build_steps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
env:
4343
# 0 - uses S3 Cache, 1 - uses GHA cache
4444
# this way the external PRs can use the GHA cache
45-
SCCACHE_GHA_VERSION: ${{secrets.AWS_S3_ACCESS_KEY && 0 || 1}}
45+
SCCACHE_GHA_VERSION: ${{secrets.AWS_S3_ACCESS_KEY == null}}
4646
SCCACHE_BUCKET: arcticdb-ci-sccache-bucket
4747
SCCACHE_ENDPOINT: http://s3.eu-west-1.amazonaws.com
4848
SCCACHE_REGION: eu-west-1

0 commit comments

Comments
 (0)