Skip to content

Commit 32c3c4f

Browse files
dotansimhadotansimha
authoredSep 30, 2020
Release & Canary release pipeline fixes (#2072)
* fixes * fixes * try to fix * fixes * fixes * release and canary fixes * fixes * added changesets for recent packages
·
release-1670524223671cross-inspect@1.0.0
1 parent 95d5483 commit 32c3c4f

10 files changed

+48
-48
lines changed
 

‎.changeset/big-poems-build.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@graphql-tools/stitch': patch
3+
'@graphql-tools/wrap': patch
4+
---
5+
6+
enhance(HoistFields): allow arguments

‎.changeset/friendly-bugs-tan.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-tools/import': patch
3+
---
4+
5+
feat(import): support specifiedBy builtin directive

‎.changeset/grumpy-ducks-clean.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@graphql-tools/merge': patch
3+
'@graphql-tools/utils': patch
4+
---
5+
6+
Fix duplication of scalar directives in merge

‎.changeset/little-penguins-tan.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@graphql-tools/merge': patch
3+
---
4+
5+
Support scalar extensions by merging directives

‎.changeset/ninety-ducks-sleep.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@graphql-tools/delegate': patch
3+
'@graphql-tools/stitch': patch
4+
---
5+
6+
enhance(stitching): improve error message for unknown types

‎.changeset/yellow-camels-nail.md

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
'@graphql-tools/load-files': patch
2828
'@graphql-tools/utils': patch
2929
'@graphql-tools/webpack-loader-runtime': patch
30-
'@graphql-tools/website': patch
3130
---
3231

3332
Bump all packages to allow adjustments

‎.github/workflows/canary.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
11
name: Canary Release
22

33
on:
4-
push:
5-
branches:
6-
- master
74
pull_request:
85
branches:
96
- master
7+
108
jobs:
119
publish-canary:
1210
name: Publish Canary
1311
runs-on: ubuntu-latest
14-
if: contains(github.actor, 'dependabot') == false
12+
if: github.event.pull_request.head.repo.full_name == github.repository
1513
steps:
1614
- name: Checkout Master
1715
uses: actions/checkout@v1
1816
- name: Use Node
1917
uses: actions/setup-node@v1
2018
with:
2119
node-version: '14.x'
20+
- name: Configure Git Credentials
21+
run: |
22+
git config --global user.email "theguild-bot@users.noreply.github.com"
23+
git config --global user.name "theguild-bot"
24+
echo "machine github.com login theguild-bot password ${{secrets.GH_API_TOKEN}}" > ~/.netrc
25+
- name: Setup NPM credentials
26+
run: echo "//registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN" >> ~/.npmrc
27+
env:
28+
NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
2229
- name: Get yarn cache
2330
id: yarn-cache
2431
run: echo "::set-output name=dir::$(yarn cache dir)"

‎.github/workflows/release.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
name: NPM Release
1+
name: Release
22
on:
3-
release:
4-
types: [published]
3+
push:
4+
branches:
5+
- master
56
jobs:
67
build:
78
runs-on: ubuntu-latest

‎patches/@changesets+cli+2.10.2.patch ‎patches/@changesets+cli+2.10.3.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ index 2805efd..a1822ea 100644
55
@@ -488,7 +488,7 @@ async function version(cwd, options, config) {
66
// @ts-ignore
77
var isCI = !!(isCI$1 || process.env.GITHUB_ACTIONS);
8-
8+
99
-const npmRequestLimit = pLimit(40);
1010
+const npmRequestLimit = pLimit(3);
11-
11+
1212
function jsonParse(input) {
1313
try {
1414
diff --git a/node_modules/@changesets/cli/dist/cli.cjs.prod.js b/node_modules/@changesets/cli/dist/cli.cjs.prod.js
1515
index e07a234..1bb957d 100644
1616
--- a/node_modules/@changesets/cli/dist/cli.cjs.prod.js
1717
+++ b/node_modules/@changesets/cli/dist/cli.cjs.prod.js
1818
@@ -311,7 +311,7 @@ async function version(cwd, options, config) {
19-
19+
2020
var isCI = !(!isCI$1 && !process.env.GITHUB_ACTIONS);
21-
21+
2222
-const npmRequestLimit = pLimit(40);
2323
+const npmRequestLimit = pLimit(3);
24-
24+
2525
function jsonParse(input) {
2626
try {

‎yarn.lock

-35
Original file line numberDiff line numberDiff line change
@@ -2918,14 +2918,6 @@
29182918
"@typescript-eslint/typescript-estree" "4.3.0"
29192919
debug "^4.1.1"
29202920

2921-
"@typescript-eslint/scope-manager@4.2.0":
2922-
version "4.2.0"
2923-
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.2.0.tgz#d10e6854a65e175b22a28265d372a97c8cce4bfc"
2924-
integrity sha512-Tb402cxxObSxWIVT+PnBp5ruT2V/36yj6gG4C9AjkgRlZpxrLAzWDk3neen6ToMBGeGdxtnfFLoJRUecGz9mYQ==
2925-
dependencies:
2926-
"@typescript-eslint/types" "4.2.0"
2927-
"@typescript-eslint/visitor-keys" "4.2.0"
2928-
29292921
"@typescript-eslint/scope-manager@4.3.0":
29302922
version "4.3.0"
29312923
resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.3.0.tgz#c743227e087545968080d2362cfb1273842cb6a7"
@@ -2934,30 +2926,11 @@
29342926
"@typescript-eslint/types" "4.3.0"
29352927
"@typescript-eslint/visitor-keys" "4.3.0"
29362928

2937-
"@typescript-eslint/types@4.2.0":
2938-
version "4.2.0"
2939-
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.2.0.tgz#6f6b094329e72040f173123832397c7c0b910fc8"
2940-
integrity sha512-xkv5nIsxfI/Di9eVwN+G9reWl7Me9R5jpzmZUch58uQ7g0/hHVuGUbbn4NcxcM5y/R4wuJIIEPKPDb5l4Fdmwg==
2941-
29422929
"@typescript-eslint/types@4.3.0":
29432930
version "4.3.0"
29442931
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.3.0.tgz#1f0b2d5e140543e2614f06d48fb3ae95193c6ddf"
29452932
integrity sha512-Cx9TpRvlRjOppGsU6Y6KcJnUDOelja2NNCX6AZwtVHRzaJkdytJWMuYiqi8mS35MRNA3cJSwDzXePfmhU6TANw==
29462933

2947-
"@typescript-eslint/typescript-estree@4.2.0":
2948-
version "4.2.0"
2949-
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.2.0.tgz#9d746240991c305bf225ad5e96cbf57e7fea0551"
2950-
integrity sha512-iWDLCB7z4MGkLipduF6EOotdHNtgxuNKnYD54nMS/oitFnsk4S3S/TE/UYXQTra550lHtlv9eGmp+dvN9pUDtA==
2951-
dependencies:
2952-
"@typescript-eslint/types" "4.2.0"
2953-
"@typescript-eslint/visitor-keys" "4.2.0"
2954-
debug "^4.1.1"
2955-
globby "^11.0.1"
2956-
is-glob "^4.0.1"
2957-
lodash "^4.17.15"
2958-
semver "^7.3.2"
2959-
tsutils "^3.17.1"
2960-
29612934
"@typescript-eslint/typescript-estree@4.3.0":
29622935
version "4.3.0"
29632936
resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.3.0.tgz#0edc1068e6b2e4c7fdc54d61e329fce76241cee8"
@@ -2972,14 +2945,6 @@
29722945
semver "^7.3.2"
29732946
tsutils "^3.17.1"
29742947

2975-
"@typescript-eslint/visitor-keys@4.2.0":
2976-
version "4.2.0"
2977-
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.2.0.tgz#ae13838e3a260b63ae51021ecaf1d0cdea8dbba5"
2978-
integrity sha512-WIf4BNOlFOH2W+YqGWa6YKLcK/EB3gEj2apCrqLw6mme1RzBy0jtJ9ewJgnrZDB640zfnv8L+/gwGH5sYp/rGw==
2979-
dependencies:
2980-
"@typescript-eslint/types" "4.2.0"
2981-
eslint-visitor-keys "^2.0.0"
2982-
29832948
"@typescript-eslint/visitor-keys@4.3.0":
29842949
version "4.3.0"
29852950
resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.3.0.tgz#0e5ab0a09552903edeae205982e8521e17635ae0"

0 commit comments

Comments
 (0)
Please sign in to comment.