Skip to content

Commit 85790a1

Browse files
misc(gha): expose action cache url and runtime as secrets (#2964)
* misc(gha): expose action cache url and runtime as secrets * (CI): Move S3 Auth to OIDC * Fix Typo * change bucket name * fix aws auth creds * misc(gha): fix invalid syntax for secrets * WIP: Add AWS session token * Increase session time * Remove actions_cache_url mount from Dockerfile Removed an unused mount for actions_cache_url in the Dockerfile. * WIP --------- Co-authored-by: Guillaume LEGENDRE <[email protected]>
1 parent efb94e0 commit 85790a1

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.github/workflows/build.yaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,14 @@ jobs:
175175
registry: docker.io
176176
username: ${{ secrets.DOCKERHUB_USERNAME }}
177177
password: ${{ secrets.DOCKERHUB_PASSWORD }}
178+
- name: configure aws credentials
179+
id: aws-creds
180+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502
181+
with:
182+
role-to-assume: ${{ secrets.AWS_ROLE_GITHUB_BUILDX_CACHE }}
183+
role-duration-seconds: 18000
184+
aws-region: us-east-1
185+
output-credentials: true
178186
# If pull request
179187
- name: Extract metadata (tags, labels) for Docker
180188
if: ${{ github.event_name == 'pull_request' }}
@@ -204,6 +212,8 @@ jobs:
204212
- name: Build and push Docker image
205213
id: build-and-push
206214
uses: docker/build-push-action@v4
215+
env:
216+
DOCKER_BUILD_SUMMARY: false
207217
with:
208218
context: .
209219
file: ${{ env.DOCKERFILE }}
@@ -215,13 +225,14 @@ jobs:
215225
PLATFORM=${{ env.PLATFORM }}
216226
build_type=${{ env.BUILD_TYPE }}
217227
sccache_gha_enabled=on
228+
secrets: |
218229
actions_results_url=${{ env.ACTIONS_RESULTS_URL }}
219230
actions_runtime_token=${{ env.ACTIONS_RUNTIME_TOKEN }}
220231
target: ${{ env.TARGET }}
221232
tags: ${{ steps.meta.outputs.tags || steps.meta-pr.outputs.tags }}
222233
labels: ${{ steps.meta.outputs.labels || steps.meta-pr.outputs.labels }}
223-
cache-from: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-cache${{ env.LABEL_EXTENSION }},mode=max,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
224-
cache-to: type=s3,region=us-east-1,bucket=ci-docker-buildx-cache,name=text-generation-inference-cache${{ env.LABEL_EXTENSION }},mode=min,access_key_id=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_ACCESS_KEY_ID }},secret_access_key=${{ secrets.S3_CI_DOCKER_BUILDX_CACHE_SECRET_ACCESS_KEY }},mode=min
234+
cache-from: type=s3,region=us-east-1,bucket=${{ vars.AWS_S3BUCKET_GITHUB_BUILDX_CACHE }},name=text-generation-inference-cache${{ env.LABEL }},mode=min,access_key_id=${{ steps.aws-creds.outputs.aws-access-key-id }},secret_access_key=${{ steps.aws-creds.outputs.aws-secret-access-key }},session_token=${{ steps.aws-creds.outputs.aws-session-token }},mode=max
235+
cache-to: type=s3,region=us-east-1,bucket=${{ vars.AWS_S3BUCKET_GITHUB_BUILDX_CACHE }},name=text-generation-inference-cache${{ env.LABEL }},mode=min,access_key_id=${{ steps.aws-creds.outputs.aws-access-key-id }},secret_access_key=${{ steps.aws-creds.outputs.aws-secret-access-key }},session_token=${{ steps.aws-creds.outputs.aws-session-token }},mode=max
225236
- name: Final
226237
id: final
227238
run: |

Dockerfile_trtllm

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@ WORKDIR /usr/src/text-generation-inference
6565
ARG cuda_arch_list
6666
ARG build_type
6767
ARG sccache_gha_enabled
68-
ARG actions_results_url
69-
ARG actions_runtime_token
7068

7169
# Install Rust
7270
ENV PATH="/root/.cargo/bin:$PATH"
@@ -84,8 +82,6 @@ ENV CUDA_ARCH_LIST=${cuda_arch_list}
8482

8583
# SCCACHE Specifics args - before finding a better, more generic, way...
8684
ENV SCCACHE_GHA_ENABLED=${sccache_gha_enabled}
87-
ENV ACTIONS_RESULTS_URL=${actions_results_url}
88-
ENV ACTIONS_RUNTIME_TOKEN=${actions_runtime_token}
8985

9086
COPY Cargo.lock Cargo.lock
9187
COPY Cargo.toml Cargo.toml
@@ -99,8 +95,8 @@ COPY --from=mpi-builder /usr/local/mpi /usr/local/mpi
9995

10096
ENV RUSTC_WRAPPER=sccache
10197
ENV CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX
102-
RUN export CC=gcc-14 \
103-
export CXX=g++-14 \
98+
RUN --mount=type=secret,id=actions_results_url,env=ACTIONS_RESULTS_URL \
99+
--mount=type=secret,id=actions_runtime_token,env=ACTIONS_RUNTIME_TOKEN \
104100
export CMAKE_C_COMPILER_LAUNCHER=sccache && \
105101
export CMAKE_CXX_COMPILER_LAUNCHER=sccache && \
106102
export CMAKE_CUDA_COMPILER_LAUNCHER=sccache && \

0 commit comments

Comments
 (0)