From 70d00a6f985bc81ee45d6fb5cfd625a9cc97920a Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Fri, 3 Dec 2021 12:25:10 +0300 Subject: [PATCH] .github: simplify checkout process We don't need separate steps for manual and automatic checkout, the default ref value can be habdled by checkout@v2 itself. --- .github/workflows/publish_to_dockerhub.yml | 44 ++-------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/.github/workflows/publish_to_dockerhub.yml b/.github/workflows/publish_to_dockerhub.yml index 8e3b5e7fa..fa634ea63 100644 --- a/.github/workflows/publish_to_dockerhub.yml +++ b/.github/workflows/publish_to_dockerhub.yml @@ -34,21 +34,12 @@ jobs: runs-on: ubuntu-20.04 steps: - - name: Checkout (manual run) - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.ref }} # Allows to fetch all history for all branches and tags. Need this for proper versioning. fetch-depth: 0 - - name: Checkout (automatical run) - if: ${{ github.event_name != 'workflow_dispatch' }} - uses: actions/checkout@v2 - with: - # Allows to fetch all history for all branches and tags. Need this for proper versioning. - fetch-depth: 0 - - name: Sync VM submodule run: | git submodule sync @@ -76,21 +67,12 @@ jobs: name: Publish Ubuntu-based image to DockerHub runs-on: ubuntu-20.04 steps: - - name: Checkout (manual run) - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.ref }} # Allows to fetch all history for all branches and tags. Need this for proper versioning. fetch-depth: 0 - - name: Checkout (automatical run) - if: ${{ github.event_name != 'workflow_dispatch' }} - uses: actions/checkout@v2 - with: - # Allows to fetch all history for all branches and tags. Need this for proper versioning. - fetch-depth: 0 - - name: Build image run: make image @@ -117,21 +99,12 @@ jobs: runs-on: windows-2022 steps: - - name: Checkout (manual run) - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.ref }} # Allows to fetch all history for all branches and tags. Need this for proper versioning. fetch-depth: 0 - - name: Checkout (automatical run) - if: ${{ github.event_name != 'workflow_dispatch' }} - uses: actions/checkout@v2 - with: - # Allows to fetch all history for all branches and tags. Need this for proper versioning. - fetch-depth: 0 - - name: Sync VM submodule run: | git submodule sync @@ -162,21 +135,12 @@ jobs: name: Publish WindowsServerCore-based image to DockerHub runs-on: windows-2022 steps: - - name: Checkout (manual run) - if: ${{ github.event_name == 'workflow_dispatch' }} - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: ref: ${{ github.event.inputs.ref }} # Allows to fetch all history for all branches and tags. Need this for proper versioning. fetch-depth: 0 - - name: Checkout (automatical run) - if: ${{ github.event_name != 'workflow_dispatch' }} - uses: actions/checkout@v2 - with: - # Allows to fetch all history for all branches and tags. Need this for proper versioning. - fetch-depth: 0 - - name: Build image run: make image-wsc