From eae9c97b232ce04da62d45cc8c600d85bf7d1a62 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sat, 10 Oct 2020 11:01:09 +0800 Subject: [PATCH] chore(CI): checkout the head commit instead of using the default merge ref --- .github/workflows/Linux-pack.yml | 42 ++++++++++++++++++++++++++++++ .github/workflows/Windows-pack.yml | 8 ++++++ .github/workflows/build_cmake.yml | 10 ++++++- .github/workflows/clang-format.yml | 9 ++++++- 4 files changed, 67 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Linux-pack.yml b/.github/workflows/Linux-pack.yml index 5b7869f9..b38b9473 100644 --- a/.github/workflows/Linux-pack.yml +++ b/.github/workflows/Linux-pack.yml @@ -46,10 +46,17 @@ jobs: } steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -102,12 +109,19 @@ jobs: image: vitzy/flameshot:ubuntu-bionic steps: - name: Checkout Source code + if: github.event_name == 'push' # Because git version < 2.18(ubuntu 18.04), so only actions/checkout@v1 can be used. # If you use actions/checkout@v2, you will have no .git folder. uses: actions/checkout@v1 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v1 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.ref }} - name: Set env & Print flameshot version shell: bash run: | @@ -199,10 +213,17 @@ jobs: } steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -285,10 +306,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -378,10 +406,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | @@ -437,10 +472,17 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - name: Set env & Print flameshot version shell: bash run: | diff --git a/.github/workflows/Windows-pack.yml b/.github/workflows/Windows-pack.yml index e56d0126..6ca6952a 100644 --- a/.github/workflows/Windows-pack.yml +++ b/.github/workflows/Windows-pack.yml @@ -52,11 +52,19 @@ jobs: steps: - name: Checkout Source code + if: github.event_name == 'push' uses: actions/checkout@v2 with: fetch-depth: 0 ref: master + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} + - name: Set env & Print flameshot version shell: bash run: | diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index ca731941..155b2b82 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -25,7 +25,15 @@ jobs: os: [ubuntu-20.04] steps: - - uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'push' + uses: actions/checkout@v2 + + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} - name: Install Dependencies run: | diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index 24382ae9..1921caeb 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -7,7 +7,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'push' + uses: actions/checkout@v2 + - name: Checkout Source code + if: github.event_name == 'pull_request' + uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} - uses: DoozyX/clang-format-lint-action@v0.9 with: source: './src'