apmpackage: remove version directory #5414
Conversation
The version directory should be added when copying to package-storage, but it is not needed in this repo. The version is maintained in manifest.yml.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
| @@ -84,7 +81,7 @@ def bump(v): | |||
| # copy over the package and replace version in manifest and pipeline names | |||
| shutil.copytree(src, dst) | |||
| subprocess.check_call('rm -rf {0}'.format(os.path.join(dst, 'README.template.md')), shell=True) | |||
| cmd = 'find {0} -not -name "*.png" -type f -print0 | xargs -0 sed -i "" "s/{1}/{2}/g"'.format( | |||
| cmd = 'find {0} -not -name "*.png" -type f -exec sed -i -e "s/{1}/{2}/g" {{}} \\;'.format( | |||
There was a problem hiding this comment.
I didn't look too deeply into it, but the script wouldn't run for me as it was -- I guess some discrepancy between the version of find shipped with macOS.
There was a problem hiding this comment.
changes look good - I ran make update with the changed code and everything still worked fine on a macOS
* apmpackage: remove version directory The version directory should be added when copying to package-storage, but it is not needed in this repo. The version is maintained in manifest.yml. * apmpackage: update package version to 0.3.0 * Update apmpackage instructions and script * Makefile: update *-package targets * add docker entrypoint to copy package to am/n.n.n * apmpackage/cmd/gen-package: no version in path * make fmt (cherry picked from commit 1876181) # Conflicts: # apmpackage/cmd/gen-package/main.go
* apmpackage: remove version directory (#5414) * apmpackage: remove version directory The version directory should be added when copying to package-storage, but it is not needed in this repo. The version is maintained in manifest.yml. * apmpackage: update package version to 0.3.0 * Update apmpackage instructions and script * Makefile: update *-package targets * add docker entrypoint to copy package to am/n.n.n * apmpackage/cmd/gen-package: no version in path * make fmt (cherry picked from commit 1876181) # Conflicts: # apmpackage/cmd/gen-package/main.go * Fix merge conflict Co-authored-by: Andrew Wilkins <[email protected]>
|
I guess apm-integration-testing's |
|
Ah, I didn't know about that one. Indeed, we'd need to do something like https://github.com/elastic/apm-server/blob/master/testing/docker/package-registry/entrypoint.sh |
Motivation/summary
Remove the version from the apm integration package directory. It is not necessary, and the version bumping makes retaining git history more difficult. See: https://github.com/elastic/apm-server/commits/master/apmpackage/apm/0.3.0
With these changes, bumping the version should just be a matter of updating
apmpackage/apm/manifest.ymland adding a changelog entry.How to test these changes
Non-functional change.