@eui/tools 6.20.12 → 6.20.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/.version.properties +1 -1
  2. package/CHANGELOG.md +9 -0
  3. package/package.json +1 -1
  4. package/scripts/csdr/init/remotes.js +4 -1
  5. package/scripts/csdr/metadata/common.js +10 -16
  6. package/scripts/csdr/release/package/release-remote-standalone.js +100 -100
  7. package/scripts/utils/git-utils.js +4 -3
package/.version.properties CHANGED
@@ -1 +1 @@
1
- 6.20.12
1
+ 6.20.13
package/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ## 6.20.13 (2024-08-09)
2
+
3
+ ##### Chores
4
+
5
+ * **other:**
6
+ * adapted git clone destination folder to full path - EUI-9788 [EUI-9788](https://webgate.ec.europa.eu/CITnet/jira/browse/EUI-9788) ([d8fa9c90](https://webgate.ec.europa.eu/CITnet/stash/scm/csdr/eui-tools.git/commits/d8fa9c90d272126017743392483a53bddbe2c343))
7
+
8
+ * * *
9
+ * * *
1
10
  ## 6.20.12 (2024-08-09)
2
11
 
3
12
  ##### Chores
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eui/tools",
3
- "version": "6.20.12",
3
+ "version": "6.20.13",
4
4
  "tag": "latest",
5
5
  "license": "EUPL-1.1",
6
6
  "description": "eUI common tools and scripts",
package/scripts/csdr/init/remotes.js CHANGED
@@ -61,7 +61,10 @@ const cloneRemotesConfig = module.exports.cloneRemotesConfig = () => {
61
61
  const cloneRemotesConfigStandalone = module.exports.cloneRemotesConfigStandalone = () => {
62
62
  return Promise.resolve()
63
63
  .then(() => {
64
- return gitUtils.cloneRepoStandalone('csdr-config','.config');
64
+ return gitUtils.cloneRepoStandalone(
65
+ 'csdr-config',
66
+ path.join(process.cwd(), '.config')
67
+ );
65
68
  })
66
69
 
67
70
  .catch((e) => {
package/scripts/csdr/metadata/common.js CHANGED
@@ -59,20 +59,14 @@ module.exports.cloneMetadataRepoStandalone = () => {
59
59
 
60
60
  tools.logTitle('Cloning devops metadata repo');
61
61
 
62
- if (dryRun || skipClone) {
63
- tools.logInfo('DRY-RUN: cloning skipped');
64
- return Promise.resolve();
65
-
66
- } else {
67
- return Promise.resolve()
68
- .then(() => {
69
- return gitUtils.cloneRepoStandalone(
70
- configOptions.DEVOPS_METADATA_REPOSITORY,
71
- configOptions.DEVOPS_METADATA_PATH
72
- );
73
- })
74
- .catch((e) => {
75
- throw e;
76
- })
77
- }
62
+ return Promise.resolve()
63
+ .then(() => {
64
+ return gitUtils.cloneRepoStandalone(
65
+ configOptions.DEVOPS_METADATA_REPOSITORY,
66
+ configOptions.DEVOPS_METADATA_PATH
67
+ );
68
+ })
69
+ .catch((e) => {
70
+ throw e;
71
+ })
78
72
  }
package/scripts/csdr/release/package/release-remote-standalone.js CHANGED
@@ -20,7 +20,7 @@ const innerCommon = require('./common');
20
20
  // LOCAL TEST :
21
21
  // - symlink eUI tools sources to node_modules of standalone pkg folder node_modules to test
22
22
  // - execute this command on the standalone pkg folder :
23
- // npx @eui/tools release-remote-standalone --remoteName zzz-test-remote-eui18 --dryRun --debug --debugNotification
23
+ // npx @eui/tools release-remote-standalone --remoteName zzz-test-remote-eui18 --envTarget DEV --dryRun --debug --debugNotification --debugGitUpdates --skipPublish
24
24
 
25
25
 
26
26
 
@@ -75,123 +75,123 @@ module.exports.run = () => {
75
75
  return metadataUtils.common.cloneMetadataRepoStandalone();
76
76
  })
77
77
 
78
- // INSTALL dependencies by type
79
- .then(() => {
80
- return installUtils.buildPackage.installRemote(pkg, envTarget);
81
- })
82
- .then((compositeDeps) => {
83
- // storing for later use
84
- pkgCompositeDeps = compositeDeps;
85
- })
78
+ // // INSTALL dependencies by type
79
+ // .then(() => {
80
+ // return installUtils.buildPackage.installRemote(pkg, envTarget);
81
+ // })
82
+ // .then((compositeDeps) => {
83
+ // // storing for later use
84
+ // pkgCompositeDeps = compositeDeps;
85
+ // })
86
86
 
87
- // BUILD THE REMOTE
88
- .then(() => {
89
- return utils.buildPackage.build(pkg, true);
90
- })
87
+ // // BUILD THE REMOTE
88
+ // .then(() => {
89
+ // return utils.buildPackage.build(pkg, true);
90
+ // })
91
91
 
92
- // UPDATE VERSION
93
- .then(() => {
94
- return innerCommon.updateVersion(pkg, null, envTarget);
95
- })
96
- .then((version) => {
97
- // storing version for later use
98
- newVersion = version;
99
- })
92
+ // // UPDATE VERSION
93
+ // .then(() => {
94
+ // return innerCommon.updateVersion(pkg, null, envTarget);
95
+ // })
96
+ // .then((version) => {
97
+ // // storing version for later use
98
+ // newVersion = version;
99
+ // })
100
100
 
101
- .then(() => {
102
- return innerCommon.postBuild(pkg, newVersion);
103
- })
101
+ // .then(() => {
102
+ // return innerCommon.postBuild(pkg, newVersion);
103
+ // })
104
104
 
105
105
 
106
- // STORING METADATA ASSETS
107
- .then(() => {
108
- return innerCommon.storeMetadataAssets(pkg, pkgCompositeDeps);
109
- })
106
+ // // STORING METADATA ASSETS
107
+ // .then(() => {
108
+ // return innerCommon.storeMetadataAssets(pkg, pkgCompositeDeps);
109
+ // })
110
110
 
111
111
 
112
- // PUBLISH PACKAGE
113
- .then(() => {
114
- return utils.publish.publish(pkg);
115
- })
112
+ // // PUBLISH PACKAGE
113
+ // .then(() => {
114
+ // return utils.publish.publish(pkg);
115
+ // })
116
116
 
117
117
 
118
- // EXECUTING POST PUBLISH SCRIPT IF AVAILABLE
119
- .then(() => {
120
- return utils.publish.postPublish(pkg);
121
- })
118
+ // // EXECUTING POST PUBLISH SCRIPT IF AVAILABLE
119
+ // .then(() => {
120
+ // return utils.publish.postPublish(pkg);
121
+ // })
122
122
 
123
123
 
124
- // STORING CENTRALIZED METADATA
125
- .then(() => {
126
- // get run duration
127
- const duration = utils.pipeline.getTimerDuration();
124
+ // // STORING CENTRALIZED METADATA
125
+ // .then(() => {
126
+ // // get run duration
127
+ // const duration = utils.pipeline.getTimerDuration();
128
128
 
129
- // store envs + versions for virtual remotes
130
- return metadataUtils.remotePackage.storeMetadata(pkg, newVersion, pkgCompositeDeps, duration, envTarget);
131
- })
129
+ // // store envs + versions for virtual remotes
130
+ // return metadataUtils.remotePackage.storeMetadata(pkg, newVersion, pkgCompositeDeps, duration, envTarget);
131
+ // })
132
132
 
133
133
 
134
- // // GENERATE DIFF REPORT
134
+ // // // GENERATE DIFF REPORT
135
+ // // .then(() => {
136
+ // // let metadata;
137
+
138
+ // // if (envTarget !== 'DEV') {
139
+ // // return Promise.resolve()
140
+ // // .then(() => {
141
+ // // return metadataUtils.remoteHistory.generateDiffCommitsMetadataReport(pkg, envTarget);
142
+ // // })
143
+ // // .then((output) => {
144
+ // // metadata = output;
145
+ // // })
146
+ // // .then(() => {
147
+ // // return utils.notification.package.sendPackageDiffReportMessage(
148
+ // // pkg,
149
+ // // metadata.diffsMetadata
150
+ // // );
151
+ // // })
152
+ // // .then(() => {
153
+ // // return metadataUtils.remoteHistory.storeMetadataHistory(pkg, metadata, newVersion);
154
+ // // })
155
+ // // .then(() => {
156
+ // // if (metadata.commitsMetadata && metadata.commitsMetadata.issues) {
157
+ // // return metadataUtils.remoteHistory.generatePipelineIssuesList(metadata.commitsMetadata.issues);
158
+ // // }
159
+ // // })
160
+ // // .catch((e) => {
161
+ // // utils.tools.logError('Error generating diffs report for current remote processed :');
162
+ // // console.log(e);
163
+ // // })
164
+ // // }
165
+ // // })
166
+
167
+
168
+ // // COMMITING METADATA
135
169
  // .then(() => {
136
- // let metadata;
137
-
138
- // if (envTarget !== 'DEV') {
139
- // return Promise.resolve()
140
- // .then(() => {
141
- // return metadataUtils.remoteHistory.generateDiffCommitsMetadataReport(pkg, envTarget);
142
- // })
143
- // .then((output) => {
144
- // metadata = output;
145
- // })
146
- // .then(() => {
147
- // return utils.notification.package.sendPackageDiffReportMessage(
148
- // pkg,
149
- // metadata.diffsMetadata
150
- // );
151
- // })
152
- // .then(() => {
153
- // return metadataUtils.remoteHistory.storeMetadataHistory(pkg, metadata, newVersion);
154
- // })
155
- // .then(() => {
156
- // if (metadata.commitsMetadata && metadata.commitsMetadata.issues) {
157
- // return metadataUtils.remoteHistory.generatePipelineIssuesList(metadata.commitsMetadata.issues);
158
- // }
159
- // })
160
- // .catch((e) => {
161
- // utils.tools.logError('Error generating diffs report for current remote processed :');
162
- // console.log(e);
163
- // })
164
- // }
170
+ // return innerCommon.commitMetadata(pkg, newVersion);
165
171
  // })
166
172
 
167
173
 
168
- // COMMITING METADATA
169
- .then(() => {
170
- return innerCommon.commitMetadata(pkg, newVersion);
171
- })
172
-
173
-
174
- // EXPORT ADDITIONAL PIPELINE VARIABLES
175
- .then(() => {
176
- return innerCommon.exportPipelineVariables(pkg);
177
- })
174
+ // // EXPORT ADDITIONAL PIPELINE VARIABLES
175
+ // .then(() => {
176
+ // return innerCommon.exportPipelineVariables(pkg);
177
+ // })
178
178
 
179
- // SEND SUCCESS NOTIFICATION
180
- .then(() => {
181
- return innerCommon.sendSuccessNotification(pkg, newVersion)
182
- .then(() => {
183
- return innerCommon.close(pkg);
184
- });
185
- })
179
+ // // SEND SUCCESS NOTIFICATION
180
+ // .then(() => {
181
+ // return innerCommon.sendSuccessNotification(pkg, newVersion)
182
+ // .then(() => {
183
+ // return innerCommon.close(pkg);
184
+ // });
185
+ // })
186
186
 
187
- // SEND ERROR NOTIFICATION
188
- .catch((e) => {
189
- return innerCommon.sendErrorNotification(pkg, e)
190
- .then(() => {
191
- return innerCommon.close(pkg);
192
- })
193
- .then(() => {
194
- process.exit(1);
195
- })
196
- })
187
+ // // SEND ERROR NOTIFICATION
188
+ // .catch((e) => {
189
+ // return innerCommon.sendErrorNotification(pkg, e)
190
+ // .then(() => {
191
+ // return innerCommon.close(pkg);
192
+ // })
193
+ // .then(() => {
194
+ // process.exit(1);
195
+ // })
196
+ // })
197
197
  }
package/scripts/utils/git-utils.js CHANGED
@@ -292,8 +292,9 @@ const cloneRepoStandalone = (repoName, destinationFolder) => {
292
292
  const auth = process.env.gituser && process.env.gitpassword ? `${process.env.gituser}:${process.env.gitpassword}@` : '';
293
293
  const gitHost = configUtils.global.getConfigOptionsStandalone().GIT_HOST_REMOTE;
294
294
 
295
+ tools.logInfo(`executing : for host: ${gitHost} - repoName: ${repoName} - destination folder: ${destinationFolder}`);
296
+
295
297
  if (!tools.isDirExists(destinationFolder)) {
296
- tools.logInfo(`executing : for host: ${gitHost} - repoName: ${repoName}`);
297
298
 
298
299
  if (skipGitUpdates) {
299
300
  tools.logInfo('DRY RUN - skipping');
@@ -302,9 +303,9 @@ const cloneRepoStandalone = (repoName, destinationFolder) => {
302
303
  }
303
304
  }
304
305
 
305
- const pullFolder = path.join(folder, destinationFolder);
306
+ tools.logInfo(`pulling folder: ${destinationFolder}`);
306
307
 
307
- execa.shellSync(`git pull`, { cwd: pullFolder, stdio: 'inherit' });
308
+ execa.shellSync(`git pull`, { cwd: destinationFolder, stdio: 'inherit' });
308
309
  }
309
310
 
310
311