Skip to content

Commit 289675f

Browse files
jfeingold35jfeingold35
committed
6th try
1 parent 90f57e8 commit 289675f

File tree

2 files changed

+88
-88
lines changed

2 files changed

+88
-88
lines changed

‎.github/workflows/publish-package-to-npm.yml

+67-67
Original file line numberDiff line numberDiff line change
@@ -156,73 +156,73 @@ jobs:
156156
# GraphQL also needs the top-level package-lock.json
157157
PACKAGE_LOCK_JSON="$(cat package-lock.json | base64)"
158158
159-
gh api graphql -F message="$MESSAGE" -F oldOid=`git rev-parse HEAD` -F branch="$BRANCH_NAME" \
160-
-F corePackage="$CORE_PACKAGE_JSON" \
161-
-F apiPackage="$API_PACKAGE_JSON" \
162-
-F eslintPackage="$ESLINT_PACKAGE_JSON" \
163-
-F flowPackage="$FLOW_PACKAGE_JSON" \
164-
-F pmdPackage="$PMD_PACKAGE_JSON" \
165-
-F regexPackage="$REGEX_PACKAGE_JSON" \
166-
-F retirejsPackage="$RETIREJS_PACKAGE_JSON" \
167-
-F sfgePackage="$SFGE_PACKAGE_JSON" \
168-
-F templatePackage="$TEMPLATE_PACKAGE_JSON" \
169-
-F packageLock="$PACKAGE_LOCK_JSON" \
170-
-f query='
171-
mutation ($message: String!, $oldOid: GitObjectID!, $branch: String!,
172-
$corePackage: Base64String!, $apiPackage: Base64String!, $eslintPackage: Base64String!,
173-
$flowPackage: Base64String!, $pmdPackage: Base64String!, $regexPackage: Base64String!,
174-
$retirejsPackage: Base64String!, $sfgePackage: Base64String!, $templatePackage: Base64String!,
175-
$packageLock: Base64String!) {
176-
createCommitOnBranch(input: {
177-
branch: {
178-
repositoryNameWithOwner: "forcedotcom/code-analyzer-core",
179-
branchName: $branch
180-
},
181-
message: {
182-
headline: $message
183-
},
184-
fileChanges: {
185-
additions: [
186-
{
187-
path: "packages/code-analyzer-core/package.json",
188-
contents: $corePackage
189-
}, {
190-
path: "packages/code-analyzer-engine-api/package.json",
191-
contents: $apiPackage
192-
}, {
193-
path: "packages/code-analyzer-eslint-engine/package.json",
194-
contents: $eslintPackage
195-
}, {
196-
path: "packages/code-analyzer-flow-engine/package.json",
197-
contents: $flowPackage
198-
}, {
199-
path: "packages/code-analyzer-pmd-engine/package.json",
200-
contents: $pmdPackage
201-
}, {
202-
path: "packages/code-analyzer-regex-engine/package.json",
203-
contents: $regexPackage
204-
}, {
205-
path: "packages/code-analyzer-retirejs-engine/package.json",
206-
contents: $retirejsPackage
207-
}, {
208-
path: "packages/code-analyzer-sfge-engine/package.json",
209-
contents: $sfgePackage
210-
}, {
211-
path: "packages/T-E-M-P-L-A-T-E/package.json",
212-
contents: $templatePackage
213-
}, {
214-
path: "package-lock.json",
215-
contents: $packageLock
216-
}
217-
]
218-
},
219-
expectedHeadOid: $oldOid
220-
}) {
221-
commit {
222-
id
223-
}
224-
}
225-
}'
159+
gh api graphql -F message="$MESSAGE" -F oldOid=`git rev-parse HEAD` -F branch="$BRANCH_NAME" \
160+
-F corePackage="$CORE_PACKAGE_JSON" \
161+
-F apiPackage="$API_PACKAGE_JSON" \
162+
-F eslintPackage="$ESLINT_PACKAGE_JSON" \
163+
-F flowPackage="$FLOW_PACKAGE_JSON" \
164+
-F pmdPackage="$PMD_PACKAGE_JSON" \
165+
-F regexPackage="$REGEX_PACKAGE_JSON" \
166+
-F retirejsPackage="$RETIREJS_PACKAGE_JSON" \
167+
-F sfgePackage="$SFGE_PACKAGE_JSON" \
168+
-F templatePackage="$TEMPLATE_PACKAGE_JSON" \
169+
-F packageLock="$PACKAGE_LOCK_JSON" \
170+
-f query='
171+
mutation ($message: String!, $oldOid: GitObjectID!, $branch: String!,
172+
$corePackage: Base64String!, $apiPackage: Base64String!, $eslintPackage: Base64String!,
173+
$flowPackage: Base64String!, $pmdPackage: Base64String!, $regexPackage: Base64String!,
174+
$retirejsPackage: Base64String!, $sfgePackage: Base64String!, $templatePackage: Base64String!,
175+
$packageLock: Base64String!) {
176+
createCommitOnBranch(input: {
177+
branch: {
178+
repositoryNameWithOwner: "forcedotcom/code-analyzer-core",
179+
branchName: $branch
180+
},
181+
message: {
182+
headline: $message
183+
},
184+
fileChanges: {
185+
additions: [
186+
{
187+
path: "packages/code-analyzer-core/package.json",
188+
contents: $corePackage
189+
}, {
190+
path: "packages/code-analyzer-engine-api/package.json",
191+
contents: $apiPackage
192+
}, {
193+
path: "packages/code-analyzer-eslint-engine/package.json",
194+
contents: $eslintPackage
195+
}, {
196+
path: "packages/code-analyzer-flow-engine/package.json",
197+
contents: $flowPackage
198+
}, {
199+
path: "packages/code-analyzer-pmd-engine/package.json",
200+
contents: $pmdPackage
201+
}, {
202+
path: "packages/code-analyzer-regex-engine/package.json",
203+
contents: $regexPackage
204+
}, {
205+
path: "packages/code-analyzer-retirejs-engine/package.json",
206+
contents: $retirejsPackage
207+
}, {
208+
path: "packages/code-analyzer-sfge-engine/package.json",
209+
contents: $sfgePackage
210+
}, {
211+
path: "packages/T-E-M-P-L-A-T-E/package.json",
212+
contents: $templatePackage
213+
}, {
214+
path: "package-lock.json",
215+
contents: $packageLock
216+
}
217+
]
218+
},
219+
expectedHeadOid: $oldOid
220+
}) {
221+
commit {
222+
id
223+
}
224+
}
225+
}'
226226
build-and-test-and-publish:
227227
runs-on: ubuntu-latest
228228
needs: [validate-packages-as-releasable, prepare-release-branch]

‎.github/workflows/publish-package-to-npm/create-branch-commit-script.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ function main() {
1414
scriptLines.push(...generateGraphQlDashFFlagsForPackages(packageNames));
1515
scriptLines.push(`-F packagelock="$PACKAGE_LOCK" \\`);
1616
scriptLines.push(`-f query='`);
17-
scriptLines.push(`mutation (${createMutationParameters(packageNames).join(', ')}) {`);
18-
scriptLines.push(` createCommitOnBranch(input: {`);
19-
scriptLines.push(` branch: {`);
20-
scriptLines.push(` repositoryNameWithOwner: "forcedotcom/code-analyzer-core",`);
21-
scriptLines.push(` branchName: $branch`);
22-
scriptLines.push(` },`);
23-
scriptLines.push(` message: {`);
24-
scriptLines.push(` headline: $message`);
25-
scriptLines.push(` },`);
26-
scriptLines.push(` fileChanges: {`);
27-
scriptLines.push(` additions: [`);
28-
scriptLines.push(` {`);
29-
scriptLines.push(createAdditionsArray(packageNames).join('}\n, {\n'));
30-
scriptLines.push(` }`);
31-
scriptLines.push(` ]`);
32-
scriptLines.push(` },`);
17+
scriptLines.push(` mutation (${createMutationParameters(packageNames).join(', ')}) {`);
18+
scriptLines.push(` createCommitOnBranch(input: {`);
19+
scriptLines.push(` branch: {`);
20+
scriptLines.push(` repositoryNameWithOwner: "forcedotcom/code-analyzer-core",`);
21+
scriptLines.push(` branchName: $branch`);
22+
scriptLines.push(` },`);
23+
scriptLines.push(` message: {`);
24+
scriptLines.push(` headline: $message`);
25+
scriptLines.push(` },`);
26+
scriptLines.push(` fileChanges: {`);
27+
scriptLines.push(` additions: [`);
28+
scriptLines.push(` {`);
29+
scriptLines.push(createAdditionsArray(packageNames).join(' }, {\n'));
30+
scriptLines.push(` }`);
31+
scriptLines.push(` ]`);
32+
scriptLines.push(` },`);
3333
scriptLines.push(` expectedHeadOid: $oldOid`);
3434
scriptLines.push(` }) {`);
3535
scriptLines.push(` commit {`);
@@ -65,7 +65,7 @@ function generateGraphQlDashFFlagsForPackages(packageNames) {
6565
function createMutationParameters(packageNames) {
6666
const mutationParameters = [];
6767
mutationParameters.push('$message: String!');
68-
mutationParameters.push('$oldOid: GitObject!');
68+
mutationParameters.push('$oldOid: GitObjectID!');
6969
mutationParameters.push('$branch: String!');
7070
for (const packageName of packageNames) {
7171
mutationParameters.push(`$${toMutationParamName(packageName)}: Base64String!`);
@@ -78,13 +78,13 @@ function createAdditionsArray(packageNames) {
7878
const additions = [];
7979
for (const packageName of packageNames) {
8080
additions.push(
81-
` path: "packages/${packageName}/package.json",\n` +
82-
` contents: $${toMutationParamName(packageName)}\n`
81+
` path: "packages/${packageName}/package.json",\n` +
82+
` contents: $${toMutationParamName(packageName)}\n`
8383
);
8484
}
8585
additions.push(
86-
` path: "package-lock.json",\n` +
87-
` contents: $packagelock\n`
86+
` path: "package-lock.json",\n` +
87+
` contents: $packagelock`
8888
);
8989
return additions;
9090
}

0 commit comments

Comments
 (0)