From f0b506f92f94623a7a1fba5923f63f8abdeacd54 Mon Sep 17 00:00:00 2001 From: Lukas Hermann Date: Mon, 15 Aug 2022 13:00:37 -0700 Subject: [PATCH 1/2] ci: use pull request head ref --- .github/workflows/check-toc.yml | 2 +- .github/workflows/check.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-toc.yml b/.github/workflows/check-toc.yml index 21d4cb2630..ad50112df3 100644 --- a/.github/workflows/check-toc.yml +++ b/.github/workflows/check-toc.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 with: token: ${{ secrets.GH_PAT || github.token }} - ref: ${{ github.head_ref }} + ref: ${{ github.event.pull_request.head.ref }} - name: Setup Node uses: actions/setup-node@v3 diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 93af350d60..37867e6aad 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 with: token: ${{ secrets.GH_PAT || github.token }} - ref: ${{ github.head_ref }} + ref: ${{ github.event.pull_request.head.ref }} - name: Setup Node uses: actions/setup-node@v3 From 08df0689ef6b46c609de18c408b81898a8baeebe Mon Sep 17 00:00:00 2001 From: Lukas Hermann Date: Mon, 15 Aug 2022 13:09:59 -0700 Subject: [PATCH 2/2] fix lint --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11409a91d8..6114a2cde7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -199,7 +199,7 @@ Publishing is handled by a 2-branch [pre-release process](https://intuit.github. - PRs made into the default branch are auto-deployed to the `next` pre-release tag on NPM. The result can be installed with `npm install vega-lite/@next`. - When merging into `next`, please use the `squash and merge` strategy. - To release a new stable version, open a PR from `next` into `stable` using this [compare link](https://github.com/vega/vega-lite/compare/stable...next). - - When merging from `next` into `stable`, please use the `create a merge commit` strategy. + - When merging from `next` into `stable`, please use the `create a merge commit` strategy. - After the release note is generated (from commits), please take a look to clean up so the log is readable to the community. ## Suggested Programming Environment.