From 0ffbc3b300388f5ef65c6907bae8654899654113 Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Tue, 3 Dec 2024 15:26:28 -0800 Subject: [PATCH 1/2] Move additional actions/checkout steps to job start. --- .github/workflows/ci-sglang-benchmark.yml | 3 +-- .github/workflows/ci-sglang-integration-tests.yml | 3 +-- .github/workflows/ci-shark-ai.yml | 3 +-- .github/workflows/ci-sharktank.yml | 10 ++++------ .github/workflows/ci_eval.yaml | 5 ++--- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-sglang-benchmark.yml b/.github/workflows/ci-sglang-benchmark.yml index b1e037446..7f3967659 100644 --- a/.github/workflows/ci-sglang-benchmark.yml +++ b/.github/workflows/ci-sglang-benchmark.yml @@ -35,8 +35,7 @@ jobs: env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" steps: - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Setting up Python" id: setup_python diff --git a/.github/workflows/ci-sglang-integration-tests.yml b/.github/workflows/ci-sglang-integration-tests.yml index 59ebac4c9..e5cd47fd7 100644 --- a/.github/workflows/ci-sglang-integration-tests.yml +++ b/.github/workflows/ci-sglang-integration-tests.yml @@ -36,8 +36,7 @@ jobs: env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" steps: - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Setting up Python" id: setup_python diff --git a/.github/workflows/ci-shark-ai.yml b/.github/workflows/ci-shark-ai.yml index b206945d7..7ec69e13b 100644 --- a/.github/workflows/ci-shark-ai.yml +++ b/.github/workflows/ci-shark-ai.yml @@ -35,8 +35,7 @@ jobs: env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" steps: - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: "Setting up Python" id: setup_python diff --git a/.github/workflows/ci-sharktank.yml b/.github/workflows/ci-sharktank.yml index 1a179322a..75c224ca0 100644 --- a/.github/workflows/ci-sharktank.yml +++ b/.github/workflows/ci-sharktank.yml @@ -87,15 +87,14 @@ jobs: HF_HOME: "/data/huggingface" SHARK_PLATFORM_REPO_ROOT: ${{ github.workspace }} steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: "Setting up Python" id: setup_python uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: ${{matrix.version}} - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Cache Pip Packages uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 id: cache-pip @@ -137,15 +136,14 @@ jobs: env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: "Setting up Python" id: setup_python uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: 3.11 - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Cache Pip Packages uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 id: cache-pip diff --git a/.github/workflows/ci_eval.yaml b/.github/workflows/ci_eval.yaml index 5e4a9bf77..e3656a33d 100644 --- a/.github/workflows/ci_eval.yaml +++ b/.github/workflows/ci_eval.yaml @@ -100,15 +100,14 @@ jobs: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" SHARK_PLATFORM_REPO_ROOT: ${{ github.workspace }} steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: "Setting up Python" id: setup_python uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0 with: python-version: ${{matrix.version}} - - name: "Checkout Code" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Cache Pip Packages uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2 id: cache-pip From 2a2f65f0aa3151b3c679bc566df3f27fc6595a6e Mon Sep 17 00:00:00 2001 From: Scott Todd Date: Tue, 3 Dec 2024 15:49:52 -0800 Subject: [PATCH 2/2] Removing SHARK_PLATFORM_REPO_ROOT. --- .github/workflows/ci-sharktank.yml | 1 - .github/workflows/ci_eval.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/ci-sharktank.yml b/.github/workflows/ci-sharktank.yml index 75c224ca0..bf616bee6 100644 --- a/.github/workflows/ci-sharktank.yml +++ b/.github/workflows/ci-sharktank.yml @@ -85,7 +85,6 @@ jobs: env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" HF_HOME: "/data/huggingface" - SHARK_PLATFORM_REPO_ROOT: ${{ github.workspace }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/ci_eval.yaml b/.github/workflows/ci_eval.yaml index e3656a33d..7433bf167 100644 --- a/.github/workflows/ci_eval.yaml +++ b/.github/workflows/ci_eval.yaml @@ -98,7 +98,6 @@ jobs: shell: bash env: PIP_CACHE_DIR: "${{ github.workspace }}/.pip-cache" - SHARK_PLATFORM_REPO_ROOT: ${{ github.workspace }} steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2