From 88033c12f1d228c392b282c37e5d5dfe32a89038 Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Thu, 20 Feb 2020 11:43:02 -0500 Subject: [PATCH 1/3] Use actions/checkout@v2 --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d40d8677582..088c5077db0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,7 +10,7 @@ jobs: os: [ubuntu-latest, windows-latest] steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: fetch-depth: 1 @@ -46,7 +46,7 @@ jobs: os: [ubuntu-latest, windows-latest] steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v2 with: fetch-depth: 1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b9f6c723048..523d6cd6b2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,7 +27,7 @@ jobs: # TODO Share steps with the main workflow. steps: - name: Checkout - uses: actions/checkout@master + uses: actions/checkout@v2 - uses: actions/setup-node@v1 with: From 7429af3e273de66b9ceec1c12a5142b403c3dae3 Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Fri, 21 Feb 2020 08:30:43 -0500 Subject: [PATCH 2/3] Fix create pull request step - Bump create-pull-request version - Actually checkout master branch --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 523d6cd6b2f..73d5a84d66d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,6 +38,7 @@ jobs: - name: Fetch master branch run: | git fetch --depth=1 origin master:master + git checkout master - name: Build run: | @@ -110,7 +111,7 @@ jobs: echo "::set-output name=next_version::$NEXT_VERSION" - name: Create version bump PR - uses: peter-evans/create-pull-request@c202684c928d4c9f18394b2ad11df905c5d8b40c # v2.1.2 + uses: peter-evans/create-pull-request@c7b64af0a489eae91f7890f2c1b63d13cc2d8ab7 # v2.4.2 if: success() with: token: ${{ secrets.GITHUB_TOKEN }} From ef0623c60598e4333939da4e0d8718d98a72c64f Mon Sep 17 00:00:00 2001 From: Jason Reed Date: Mon, 24 Feb 2020 09:07:43 -0500 Subject: [PATCH 3/3] Switch to master branch just before version bump PR creation --- .github/workflows/release.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73d5a84d66d..76d7de7a0d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,13 +33,6 @@ jobs: with: node-version: '10.18.1' - # The checkout action does not fetch the master branch. - # Fetch the master branch so that we can base the version bump PR against master. - - name: Fetch master branch - run: | - git fetch --depth=1 origin master:master - git checkout master - - name: Build run: | cd build @@ -100,6 +93,13 @@ jobs: asset_name: ${{ format('vscode-codeql-{0}.vsix', steps.prepare-artifacts.outputs.ref_name) }} asset_content_type: application/zip + # The checkout action does not fetch the master branch. + # Fetch the master branch so that we can base the version bump PR against master. + - name: Fetch master branch + run: | + git fetch --depth=1 origin master:master + git checkout master + - name: Bump patch version id: bump-patch-version if: success()