misc(ci): let's try this way

huggingface · Dec 12, 2024 · e6abfdc · e6abfdc
1 parent 5f1b16f
commit e6abfdc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/build_trtllm.yaml b/.github/workflows/build_trtllm.yaml
@@ -29,13 +29,6 @@ jobs:
       group: aws-highmemory-32-plus-priv
     steps:
       - uses: actions/checkout@v4
-      #- uses: actions-rust-lang/setup-rust-toolchain@v1
-      - name: Install Rust Stable
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          toolchain: stable
-          components: rustfmt, clippy
-          override: true
 
       - name: "Configure AWS Credentials"
         id: aws-creds
@@ -61,13 +54,15 @@ jobs:
           push: false
           platforms: 'linux/amd64'
           build-args: |
-            AWS_ACCESS_KEY_ID: ${{ steps.aws-creds.outputs.aws-access-key-id }}
-            AWS_SECRET_ACCESS_KEY: ${{ steps.aws-creds.outputs.aws-secret-access-key }}
             BUILD_TYPE=debug
-            SCCACHE_BUCKET: ${{ secrets.AWS_S3_BUCKET_GITHUB_TGI_TEST }}
             SCCACHE_REGION: us-east-1
             SCCACHE_S3_USE_SSL: false
             SCCACHE_S3_KEY_PREFIX: trtllm
+          secrets:
+            AWS_ACCESS_KEY_ID=${{ steps.aws-creds.outputs.aws-access-key-id }}
+            AWS_SECRET_ACCESS_KEY=${{ steps.aws-creds.outputs.aws-secret-access-key }}
+            SCCACHE_BUCKET=${{ secrets.AWS_S3_BUCKET_GITHUB_TGI_TEST }}
+
 
 
 

diff --git a/Dockerfile_trtllm b/Dockerfile_trtllm
@@ -76,14 +76,16 @@ ENV LD_LIBRARY_PATH="/usr/local/mpi/lib:$LD_LIBRARY_PATH"
 ENV PKG_CONFIG_PATH="/usr/local/mpi/lib/pkgconfig:$PKG_CONFIG_PATH"
 
 # Retrieve potential build arg for S3 caching
-ENV SCCACHE_BUCKET ${SCCACHE_BUCKET}
+#ENV SCCACHE_BUCKET ${SCCACHE_BUCKET}
 ENV SCCACHE_REGION ${SCCACHE_REGION}
 ENV SCCACHE_S3_KEY_PREFIX ${SCCACHE_S3_KEY_PREFIX}
 
 COPY . .
 COPY --from=trt-builder /usr/local/tensorrt /usr/local/tensorrt
 COPY --from=mpi-builder /usr/local/mpi /usr/local/mpi
-RUN --mount=type=secret,id=AWS_ACCESS_KEY_ID,env=${AWS_ACCESS_KEY_ID} --mount=type=secret,id=AWS_SECRET_ACCESS_KEY,env=${AWS_SECRET_ACCESS_KEY} \
+RUN --mount=type=secret,id=AWS_ACCESS_KEY_ID,env=${AWS_ACCESS_KEY_ID}\
+    --mount=type=secret,id=AWS_SECRET_ACCESS_KEY,env=${AWS_SECRET_ACCESS_KEY} \
+    --mount=type=secret,id=SCCACHE_BUCKET,env=${SCCACHE_BUCKET} \
     mkdir $TGI_INSTALL_PREFIX && mkdir "$TGI_INSTALL_PREFIX/include" && mkdir "$TGI_INSTALL_PREFIX/lib" && \
     CMAKE_INSTALL_PREFIX=$TGI_INSTALL_PREFIX cargo build --${BUILD_TYPE} --package text-generation-backends-trtllm --bin text-generation-backends-trtllm