Skip to content

Commit 486a0b6

Browse files
committed
ci: placeholder pro folder for pro build testing
1 parent 4868ba2 commit 486a0b6

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Thumbs.db
1313
/src/appConfig.js
1414
/src/extensionsIntegrated/pro-loader.js
1515
/test/pro-test-suite.js
16+
/src/extensionsIntegrated/phoenix-pro-temp
1617

1718
# ignore node_modules inside src
1819
/src/node_modules

gulpfile.js/optional-build.js

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,22 @@ function clonePhoenixProRepo() {
4040

4141
const proRepoUrl = process.env.PRO_REPO_URL;
4242
const proRepoToken = process.env.PRO_REPO_ACCESS_TOKEN;
43-
const targetDir = path.resolve(__dirname, '../src/extensionsIntegrated/phoenix-pro');
43+
// TODO: Change pack to phoenix-pro folder after porting is complete
44+
const targetDir = path.resolve(__dirname, '../src/extensionsIntegrated/phoenix-pro-temp');
4445

45-
// Check if both environment variables are set
46-
if (!proRepoUrl || !proRepoToken) {
46+
// Check if repository URL is set
47+
if (!proRepoUrl) {
4748
// this si what will happen in most dev builds.
48-
console.log('Skipping phoenix-pro clone: PRO_REPO_URL or PRO_REPO_ACCESS_TOKEN not set');
49+
console.log('Skipping phoenix-pro clone: PRO_REPO_URL not set');
4950
console.log('This is expected for community builds');
5051
resolve();
5152
return;
5253
}
5354

55+
if (!proRepoToken) {
56+
console.warn('PRO_REPO_ACCESS_TOKEN not set, will attempt clone without authentication');
57+
}
58+
5459
// all code below is only likely to be executed in the ci environment
5560

5661
// Check if directory already exists
@@ -111,8 +116,10 @@ function clonePhoenixProRepo() {
111116
const commitID = trackingRepos.phoenixPro.commitID;
112117
console.log(`Target commit: ${commitID}`);
113118

114-
// Construct authenticated URL
115-
const authUrl = proRepoUrl.replace('https://', `https://oauth2:${proRepoToken}@`);
119+
// Construct authenticated URL if token is available
120+
const authUrl = proRepoToken
121+
? proRepoUrl.replace('https://', `https://oauth2:${proRepoToken}@`)
122+
: proRepoUrl;
116123

117124
// Step 1: Shallow clone
118125
console.log('Step 1/3: Cloning repository (shallow clone)...');
@@ -153,7 +160,7 @@ function clonePhoenixProRepo() {
153160
console.error(`Error: ${error.message}`);
154161
console.error('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━');
155162
console.error('Build failed because:');
156-
console.error(' - PRO_REPO_URL and PRO_REPO_ACCESS_TOKEN are set (phoenix-pro expected)');
163+
console.error(' - PRO_REPO_URL is set (phoenix-pro expected)');
157164
console.error(' - Clone operation failed');
158165
console.error('');
159166
console.error('Possible causes:');

tracking-repos.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"phoenixPro": {
3-
"commitID": "5692b8e6d4b0b6f24bb81fbd15a1a9afe85f4c52"
3+
"commitID": "ad56f43c6379c66a327e3f15e4535bf9a41756c9"
44
}
55
}

0 commit comments

Comments
 (0)