Build all of the vector dir in the build process - #2558
Conversation
So the whole vector/ directory can now be removed during the build process and we don't ship random files that end up in the vector directory.
richvdh
left a comment
richvdh
left a comment
There was a problem hiding this comment.
This generally seems like a great idea.
It will need to carry some sort of health warning to people who have locally-modified config.jsons which need moving. In fact I'm somewhat tempted to suggest leaving it where it is and making a new build directory. WDYT?
| "build": "node scripts/babelcheck.js && npm run build:res && npm run build:config && npm run build:emojione && npm run build:css && npm run build:bundle", | ||
| "build:dev": "npm run build:emojione && npm run build:css && npm run build:bundle:dev", | ||
| "dist": "scripts/package.sh", | ||
| "start:res": "parallelshell \"cpx -w \\\"{src/skins/vector/fonts,src/skins/vector/img}/**\\\" vector/\" \"cpx \\\"{res/media,res/vector-icons}/**\\\" vector/\"", |
There was a problem hiding this comment.
the idea of nesting parallelshells makes me sad. Is there a reason these need to be separate cpx invocations?
Failing that the second cpx needs a -w.
There was a problem hiding this comment.
Yeah, if they're the same one, cpx copies it as a whole tree to vector/res[...] and vector/src[...] :(
|
Yeah, possibly. OTOH, renaming the dir will break our deploy script, although maybe this is more fixable. |
People may have config files in vector/ so it would be nonideal if we started overwriting them / blowing them away.
|
Rewritten to use |
| /vector/config.json | ||
| /vector/index.html | ||
| /vector/olm.* | ||
| /vector |
| "reskindex": "reskindex -h src/header", | ||
| "build:emojione": "cpx \"node_modules/emojione/assets/svg/*\" vector/emojione/svg/", | ||
| "build:res": "cpx \"{src/skins/vector/fonts,src/skins/vector/img}/**\" webapp/ && cpx \"{res/media,res/vector-icons}/**\" webapp/", | ||
| "build:config": "cpx config.json webapp/", |
There was a problem hiding this comment.
so wasn't the point to leave config.json in vector?
There was a problem hiding this comment.
I was going to keep it in the root directory so it's more obvious to find: I don't really want a vector directory hanging around for the sole purpose of containing the config: people will have to move the config file but I don't think that's a big deal.
|
LGTM modulo update to jenkins.sh |
and make them re-use the package script rather than doing their own thing
While we're breaking things anyway
|
Fixed - quick sanity check? |
|
|
||
| # gzip up ./vector | ||
| rm vector-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist | ||
| rm packages/vector-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist |
There was a problem hiding this comment.
package.sh seems to build to dist/, not packages/ ?
There was a problem hiding this comment.
ah yes, because I changed that the other day.
richvdh
left a comment
richvdh
left a comment
There was a problem hiding this comment.
lgtm, but will leave you to merge and frob jenkins
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2 participants
So the whole vector/ directory can now be removed during the build
process and we don't ship random files that end up in the vector
directory.