From 6d8117b59b4501d97b90b96b830870f21b2e86a4 Mon Sep 17 00:00:00 2001 From: marshall_lee Date: Sun, 29 Dec 2024 16:47:08 +0800 Subject: [PATCH] ci: use pull-request sha directly in basics action --- .github/actions/basics/action.yml | 8 ++------ .github/workflows/pr.yml | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/actions/basics/action.yml b/.github/actions/basics/action.yml index acefa42..81a9873 100644 --- a/.github/actions/basics/action.yml +++ b/.github/actions/basics/action.yml @@ -93,7 +93,7 @@ runs: - name: Run prefligit env: - GITHUB_BASE_SHA: ${{ inputs.GITHUB_BASE_SHA }} + GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha || '' }} shell: bash run: | prefligit -v run --all-files @@ -104,7 +104,7 @@ runs: - name: Run pre-commit env: - GITHUB_BASE_SHA: ${{ inputs.GITHUB_BASE_SHA }} + GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha || '' }} shell: bash run: | time python3 -m venv venv @@ -130,7 +130,3 @@ inputs: description: "Rust nightly toolchain version" required: false default: "nightly" - GITHUB_BASE_SHA: - description: "The base SHA of the pull request, if any" - required: false - default: "" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f53babc..9f3646f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,8 +21,6 @@ defaults: jobs: basics: runs-on: ubuntu-latest - env: - GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha || '' }} steps: - uses: actions/checkout@v4 - uses: ./.github/actions/basics