From d5b456eb6a0a796fae0dd29c8d1efa20441f01a6 Mon Sep 17 00:00:00 2001 From: Jack Zhang Date: Tue, 28 Jan 2025 13:22:41 -0800 Subject: [PATCH] Revert "Upgrade ci linux job to v2 (#7819)" This reverts commit 6cce750f168ebf2db7d0928a8cdec4eb90b175e9. --- .github/workflows/_android.yml | 5 +- .github/workflows/_unittest.yml | 5 +- .github/workflows/android-perf.yml | 10 +-- .../workflows/android-release-artifacts.yml | 5 +- .github/workflows/doc-build.yml | 8 +- .github/workflows/lint.yml | 10 +-- .github/workflows/periodic.yml | 5 +- .github/workflows/pull.yml | 90 ++++--------------- .github/workflows/trunk.yml | 20 +---- 9 files changed, 32 insertions(+), 126 deletions(-) diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml index 36b679eda44..96fdfd51feb 100644 --- a/.github/workflows/_android.yml +++ b/.github/workflows/_android.yml @@ -7,10 +7,7 @@ on: jobs: build-llm-demo: name: build-llm-demo - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: runner: linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12-android diff --git a/.github/workflows/_unittest.yml b/.github/workflows/_unittest.yml index 414f86494b0..74ea5ca7bcc 100644 --- a/.github/workflows/_unittest.yml +++ b/.github/workflows/_unittest.yml @@ -14,10 +14,7 @@ on: jobs: linux: - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: runner: linux.2xlarge docker-image: ${{ inputs.docker-image }} diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml index a83d374ab0b..5d34bd86261 100644 --- a/.github/workflows/android-perf.yml +++ b/.github/workflows/android-perf.yml @@ -155,10 +155,7 @@ jobs: export-models: name: export-models - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main needs: set-parameters secrets: inherit strategy: @@ -335,10 +332,7 @@ jobs: build-benchmark-app: name: build-benchmark-app - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main needs: set-parameters with: runner: linux.2xlarge diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml index d204e121ffa..a10de79363c 100644 --- a/.github/workflows/android-release-artifacts.yml +++ b/.github/workflows/android-release-artifacts.yml @@ -31,10 +31,7 @@ jobs: build-aar: name: build-aar needs: check-if-aar-exists - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: runner: linux.2xlarge docker-image: executorch-ubuntu-22.04-clang12-android diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml index b52961ed0b1..7a3b862b217 100644 --- a/.github/workflows/doc-build.yml +++ b/.github/workflows/doc-build.yml @@ -15,10 +15,7 @@ on: jobs: build: - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: include: @@ -85,8 +82,7 @@ jobs: if: github.repository == 'pytorch/executorch' && github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) permissions: contents: write - contents: read - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: repository: pytorch/executorch download-artifact: docs diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index aab68b30597..93c89355d76 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,10 +16,7 @@ concurrency: jobs: lintrunner: - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: runner: linux.2xlarge docker-image: executorch-ubuntu-22.04-linter @@ -65,10 +62,7 @@ jobs: exit $RC android-java-format: - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main with: runner: linux.2xlarge docker-image: executorch-ubuntu-22.04-linter diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml index 6b4644bb522..df13140ca92 100644 --- a/.github/workflows/periodic.yml +++ b/.github/workflows/periodic.yml @@ -39,10 +39,7 @@ jobs: test-models-linux: name: test-models-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main needs: gather-models strategy: matrix: ${{ fromJSON(needs.gather-models.outputs.models) }} diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index 6825eff0fe4..dbe0e872acd 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -33,10 +33,7 @@ jobs: test-setup-linux-gcc: name: test-setup-linux-gcc - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -58,10 +55,7 @@ jobs: test-models-linux: name: test-models-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main needs: gather-models strategy: matrix: ${{ fromJSON(needs.gather-models.outputs.models) }} @@ -88,10 +82,7 @@ jobs: test-llama-runner-linux: name: test-llama-runner-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: dtype: [fp32] @@ -130,10 +121,7 @@ jobs: test-llama-runner-linux-android: name: test-llama-runner-linux-android - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -153,10 +141,7 @@ jobs: test-custom-ops-linux: name: test-custom-ops-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -177,10 +162,7 @@ jobs: test-selective-build-linux: name: test-selective-build-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -201,10 +183,7 @@ jobs: test-llava-runner-linux: name: test-llava-runner-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -235,10 +214,7 @@ jobs: test-quantized-aot-lib-linux: name: test-quantized-aot-lib-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -258,10 +234,7 @@ jobs: test-pybind-build-linux: name: test-pybind-build-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -287,10 +260,7 @@ jobs: test-binary-size-linux-gcc: name: test-binary-size-linux-gcc - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -322,10 +292,7 @@ jobs: test-binary-size-linux: name: test-binary-size-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -398,10 +365,7 @@ jobs: test-llama-runner-qnn-linux: name: test-llama-runner-qnn-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: dtype: [fp32] @@ -436,10 +400,7 @@ jobs: test-qnn-models-linux: name: test-qnn-models-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -458,10 +419,7 @@ jobs: test-phi-3-mini-runner-linux: name: test-phi-3-mini-runner-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -488,10 +446,7 @@ jobs: test-eval_llama-wikitext-linux: name: test-eval_llama-wikitext-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -518,10 +473,7 @@ jobs: test-eval_llama-mmlu-linux: name: test-eval_llama-mmlu-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -548,10 +500,7 @@ jobs: test-llama_runner_eager-linux: name: test-llama_runner_eager-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: @@ -578,10 +527,7 @@ jobs: test-mediatek-models-linux: name: test-mediatek-models-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: fail-fast: false with: diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml index 325dc6ff933..0cbbe6f643e 100644 --- a/.github/workflows/trunk.yml +++ b/.github/workflows/trunk.yml @@ -107,10 +107,7 @@ jobs: test-demo-backend-delegation: name: test-demo-backend-delegation - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: include: @@ -304,10 +301,7 @@ jobs: test-qnn-model: name: test-qnn-model - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: dtype: [fp32] @@ -367,10 +361,7 @@ jobs: # NB: Don't run this on fork PRs because they won't have access to the secret and would fail anyway if: ${{ !github.event.pull_request.head.repo.fork }} name: test-huggingface-transformers - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main secrets: inherit strategy: matrix: @@ -454,10 +445,7 @@ jobs: test-llama-runner-qnn-linux: name: test-llama-runner-qnn-linux - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main - permissions: - id-token: write - contents: read + uses: pytorch/test-infra/.github/workflows/linux_job.yml@main strategy: matrix: dtype: [fp32]