dungeonslayers/ds4
dungeonslayers/ds4
3
0
Fork 0
Code Issues 9 Pull requests 7 Projects Releases 10 Packages 1 Activity

Merge branch 'fix-release-process' into 'master'

Browse source 
Fix release process

See merge request dungeonslayers/ds4!84
This commit is contained in:
Johannes Loher 2021-02-21 05:54:28 +01:00
commit e4e4670d38
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -58,7 +58,7 @@ build:
cache: cache:
<<: *global_cache <<: *global_cache
script: | script: |
yarn updateManifest -- --update=${RELEASE_TYPE} yarn updateManifest --update=${RELEASE_TYPE}
RELEASE_VERSION=$(jq -r '.version' < package.json) RELEASE_VERSION=$(jq -r '.version' < package.json)
git add package.json package-lock.json src/system.json git add package.json package-lock.json src/system.json
git --no-pager diff git --no-pager diff

3
gulpfile.js
View file

@ -267,7 +267,6 @@ async function linkUserData() {
*/ */
function updateManifest(cb) { function updateManifest(cb) {
const packageJson = fs.readJSONSync("package.json"); const packageJson = fs.readJSONSync("package.json");
const packageLockJson = fs.readJSONSync("package-lock.json");
const manifest = getManifest(); const manifest = getManifest();
if (!manifest) cb(Error(chalk.red("Manifest JSON not found"))); if (!manifest) cb(Error(chalk.red("Manifest JSON not found")));
@ -312,7 +311,6 @@ function updateManifest(cb) {
console.log(`Updating version number to '${targetVersion}'`); console.log(`Updating version number to '${targetVersion}'`);
packageJson.version = targetVersion; packageJson.version = targetVersion;
packageLockJson.version = targetVersion;
manifest.file.version = targetVersion; manifest.file.version = targetVersion;
/* Update URL */ /* Update URL */
@ -327,7 +325,6 @@ function updateManifest(cb) {
}) + "\n"; }) + "\n";
fs.writeJSONSync("package.json", packageJson, { spaces: 4 }); fs.writeJSONSync("package.json", packageJson, { spaces: 4 });
fs.writeJSONSync("package-lock.json", packageLockJson, { spaces: 4 });
fs.writeFileSync(path.join(manifest.root, manifest.name), prettyProjectJson, "utf8"); fs.writeFileSync(path.join(manifest.root, manifest.name), prettyProjectJson, "utf8");
return cb(); return cb();