iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test(docs-infra): ensure `deploy-to-firebase` tests pass locally (#39470) 

Previously, the `deploy-to-firebase.js` script and the accompanying
`deploy-to-firebase.spec.js` spec file were using the `origin` remote
alias in certain commands. This works fine on CI, where `origin` points
to the `angular/angular` GitHub repo, but might not work locally.

This commit ensures that the correct remote is used by explicitly
specifying it by the URL, thus ensuring that the tests will behave
identically on CI and locally.

PR Close #39470
This commit is contained in:
George Kalpakas 2020-10-28 15:03:41 +02:00 committed by Joey Perrott
parent 5143d52d2b
commit eaf7d8d69f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
aio/scripts/deploy-to-firebase.js
View File

@ -9,7 +9,7 @@ const {cd, cp, exec: _exec, set} = require('shelljs');
set('-e'); set('-e');
// Arguments and environment variables // Arguments, environment variables and constants.
const args = process.argv.slice(2); const args = process.argv.slice(2);
const dryRun = args[0] === '--dry-run'; const dryRun = args[0] === '--dry-run';
@ -24,9 +24,12 @@ const {
CI_STABLE_BRANCH, CI_STABLE_BRANCH,
} = process.env; } = process.env;
const REPO_SLUG = 'angular/angular';
const NG_REMOTE_URL = `https://github.com/${REPO_SLUG}.git`;
// Do not deploy if we are running in a fork. // Do not deploy if we are running in a fork.
if (`${CI_REPO_OWNER}/${CI_REPO_NAME}` !== 'angular/angular') { if (`${CI_REPO_OWNER}/${CI_REPO_NAME}` !== REPO_SLUG) {
console.log('Skipping deploy because this is not angular/angular.'); console.log(`Skipping deploy because this is not ${REPO_SLUG}.`);
process.exit(0); process.exit(0);
} }
@ -37,7 +40,7 @@ if (CI_PULL_REQUEST !== 'false') {
} }
// Do not deploy if the current commit is not the latest on its branch. // Do not deploy if the current commit is not the latest on its branch.
const latestCommit = exec(`git ls-remote origin ${CI_BRANCH}`).slice(0, 40); const latestCommit = exec(`git ls-remote ${NG_REMOTE_URL} ${CI_BRANCH}`).slice(0, 40);
if (CI_COMMIT !== latestCommit) { if (CI_COMMIT !== latestCommit) {
console.log(`Skipping deploy because ${CI_COMMIT} is not the latest commit (${latestCommit}).`); console.log(`Skipping deploy because ${CI_COMMIT} is not the latest commit (${latestCommit}).`);
process.exit(0); process.exit(0);
@ -89,7 +92,7 @@ if (CI_BRANCH === 'master') {
// Find the branch that has highest minor version for the given `currentBranchMajorVersion`. // Find the branch that has highest minor version for the given `currentBranchMajorVersion`.
const mostRecentMinorVersion = const mostRecentMinorVersion =
// List the branches that start with the major version. // List the branches that start with the major version.
exec(`git ls-remote origin refs/heads/${currentBranchMajorVersion}.*.x`).split('\n') exec(`git ls-remote ${NG_REMOTE_URL} refs/heads/${currentBranchMajorVersion}.*.x`).split('\n')
// Extract the version number. // Extract the version number.
.map(line => line.split('/')[2]) .map(line => line.split('/')[2])
// Sort by the minor version. // Sort by the minor version.

3
aio/scripts/deploy-to-firebase.spec.js
View File

@ -6,12 +6,13 @@ const {execSync} = require('child_process');
describe('deploy-to-firebase:', () => { describe('deploy-to-firebase:', () => {
const deployToFirebaseCmd = `"${process.execPath}" "${__dirname}/deploy-to-firebase" --dry-run`; const deployToFirebaseCmd = `"${process.execPath}" "${__dirname}/deploy-to-firebase" --dry-run`;
const ngRemoteUrl = 'https://github.com/angular/angular.git';
// Helpers // Helpers
const deployToFirebaseDryRun = const deployToFirebaseDryRun =
env => execSync(deployToFirebaseCmd, {encoding: 'utf8', env}).toString().trim(); env => execSync(deployToFirebaseCmd, {encoding: 'utf8', env}).toString().trim();
const getLatestCommitForBranch = const getLatestCommitForBranch =
branch => execSync(`git ls-remote origin ${branch}`).slice(0, 40); branch => execSync(`git ls-remote ${ngRemoteUrl} ${branch}`).slice(0, 40);
it('master - skip deploy - not angular', () => { it('master - skip deploy - not angular', () => {
expect(deployToFirebaseDryRun({ expect(deployToFirebaseDryRun({