Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Have proper versioning of Che e2e project #20723

Merged
merged 2 commits into from
Nov 23, 2021
Merged

chore: Have proper versioning of Che e2e project #20723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e09e1
chore: Have proper versioning of Che e2e project
mkuznyetsov Nov 2, 2021
d7ac84f
fixup! chore: Have proper versioning of Che e2e project
mkuznyetsov Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions make-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ bump_version () {

echo "Updating project version to ${NEXT_VERSION}"
echo "${NEXT_VERSION}" > VERSION
git add VERSION
COMMIT_MSG="[release] Bump to ${NEXT_VERSION} in ${BUMP_BRANCH}"

npm --no-git-tag-version version --allow-same-version "${NEXT_VERSION}"
sed_in_place -r -e "/@eclipse-che\/api|@eclipse-che\/workspace-client|@eclipse-che\/workspace-telemetry-client/!s/(\"@eclipse-che\/..*\": )(\".*\")/\1\"$VERSION\"/" package.json
git add VERSION package.json
COMMIT_MSG="chore: Bump to ${NEXT_VERSION} in ${BUMP_BRANCH}"
git commit -asm "${COMMIT_MSG}"
git pull origin "${BUMP_BRANCH}"

Expand Down Expand Up @@ -149,6 +152,9 @@ set -e
echo "${VERSION}" > VERSION
git add VERSION

sed_in_place -r -e "/@eclipse-che\/api|@eclipse-che\/workspace-client|@eclipse-che\/workspace-telemetry-client/!s/(\"@eclipse-che\/..*\": )(\".*\")/\1\"$VERSION\"/" package.json
npm --no-git-tag-version version --allow-same-version "${VERSION}"

echo "Copying source code to dockerfile directory"
cp -r "tests/e2e" "dockerfiles/e2e/e2e"

Expand All @@ -163,7 +169,7 @@ update_issue_template "${VERSION}" "${ISSUE_TEMPLATE_FILE}"
# tag the release
git tag "${VERSION}"
git push origin "${VERSION}"
COMMIT_MSG="[release] Release ${VERSION}"
COMMIT_MSG="chore: Release ${VERSION}"
git commit -asm "${COMMIT_MSG}"

# now update ${BASEBRANCH} to the new snapshot version
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "e2e",
"version": "1.0.0",
"name": "@eclipse-che/che-e2e",
"version": "7.39.0",
"description": "",
"main": "dist/index.js",
"scripts": {
Expand Down Expand Up @@ -49,7 +49,7 @@
"typescript": "3.9.9"
},
"dependencies": {
"@eclipse-che/api": "7.5.0-SNAPSHOT",
"@eclipse-che/api": "7.38.1",
"inversify": "5.0.1",
"reflect-metadata": "0.1.13"
},
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"skipLibCheck": true,
"target": "es2017",
"module": "commonjs",
"strict": true,
Expand Down