Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into impr…
Browse files Browse the repository at this point in the history 
…ove/rewrite-permissions

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Chore: Remove duplicated useUserRoom (#25180)
  Bump version to 4.6.2
  [FIX] Database indexes not being created (#25101)
  [FIX] Deactivating user not working if user is the only room owner (#24933)
  Chore: TS migration SortList (#25167)
  [FIX] Deactivating user not working if user is the only room owner (#24933)
  Regression: Fix services Docker build on CI (#25181)
  [FIX] UserCard sanitization (#25089)
  Bump version to 4.6.1
  [FIX] Proxy settings being ignored (#25022)
  [FIX] Invitation links don't redirect to the registration form (#25082)
  [FIX] FormData uploads not working (#25069)
  [FIX] NPS never finishing sending results (#25067)
  [FIX] Upgrade Tab showing for a split second (#25050)
  [FIX] UserAutoComplete not rendering UserAvatar correctly (#25055)
  • Loading branch information
@gabriellsh
gabriellsh committed Apr 14, 2022
2 parents 6a3cfe7 + 311c9f8 commit 63c7802
Show file tree
Hide file tree
Showing 81 changed files with 1,549 additions and 1,150 deletions.
174 changes: 174 additions & 0 deletions .github/history.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73062,6 +73062,180 @@
"5.0"
],
"pull_requests": []
},
"4.6.1": {
"node_version": "14.18.3",
"npm_version": "6.14.15",
"apps_engine_version": "1.31.0",
"mongo_versions": [
"3.6",
"4.0",
"4.2",
"4.4",
"5.0"
],
"pull_requests": [
{
"pr": "25022",
"title": "[FIX] Proxy settings being ignored",
"userLogin": "pierre-lehnen-rc",
"description": "Modify Meteor's `HTTP.call` to add back proxy support",
"milestone": "4.6.1",
"contributors": [
"pierre-lehnen-rc",
"sampaiodiego"
]
},
{
"pr": "25082",
"title": "[FIX] Invitation links don't redirect to the registration form",
"userLogin": "yash-rajpal",
"milestone": "4.6.1",
"contributors": [
"yash-rajpal"
]
},
{
"pr": "25069",
"title": "[FIX] FormData uploads not working",
"userLogin": "gabriellsh",
"milestone": "4.6.1",
"contributors": [
"gabriellsh",
"dougfabris"
]
},
{
"pr": "25067",
"title": "[FIX] NPS never finishing sending results",
"userLogin": "sampaiodiego",
"milestone": "4.6.1",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "25050",
"title": "[FIX] Upgrade Tab showing for a split second",
"userLogin": "gabriellsh",
"milestone": "4.6.1",
"contributors": [
"gabriellsh"
]
},
{
"pr": "25055",
"title": "[FIX] UserAutoComplete not rendering UserAvatar correctly",
"userLogin": "dougfabris",
"description": "### before\r\n![Screen Shot 2022-04-04 at 16 50 21](https://user-images.githubusercontent.com/27704687/161620921-800bf66a-806d-4f83-b2e1-073c34215001.png)\r\n\r\n### after\r\n![Screen Shot 2022-04-04 at 16 49 00](https://user-images.githubusercontent.com/27704687/161620720-3e27774d-c241-46ca-b764-932a9295d709.png)",
"milestone": "4.6.1",
"contributors": [
"dougfabris"
]
}
]
},
"4.4.3": {
"node_version": "14.18.2",
"npm_version": "6.14.15",
"apps_engine_version": "1.30.0",
"mongo_versions": [
"3.6",
"4.0",
"4.2",
"4.4",
"5.0"
],
"pull_requests": [
{
"pr": "25022",
"title": "[FIX] Proxy settings being ignored",
"userLogin": "pierre-lehnen-rc",
"description": "Modify Meteor's `HTTP.call` to add back proxy support",
"milestone": "4.6.1",
"contributors": [
"pierre-lehnen-rc",
"sampaiodiego"
]
},
{
"pr": "25067",
"title": "[FIX] NPS never finishing sending results",
"userLogin": "sampaiodiego",
"milestone": "4.6.1",
"contributors": [
"sampaiodiego"
]
}
]
},
"4.5.6": {
"node_version": "14.18.3",
"npm_version": "6.14.15",
"apps_engine_version": "1.31.0",
"mongo_versions": [
"3.6",
"4.0",
"4.2",
"4.4",
"5.0"
],
"pull_requests": [
{
"pr": "25022",
"title": "[FIX] Proxy settings being ignored",
"userLogin": "pierre-lehnen-rc",
"description": "Modify Meteor's `HTTP.call` to add back proxy support",
"milestone": "4.6.1",
"contributors": [
"pierre-lehnen-rc",
"sampaiodiego"
]
},
{
"pr": "25067",
"title": "[FIX] NPS never finishing sending results",
"userLogin": "sampaiodiego",
"milestone": "4.6.1",
"contributors": [
"sampaiodiego"
]
}
]
},
"4.6.2": {
"node_version": "14.18.3",
"npm_version": "6.14.15",
"apps_engine_version": "1.31.0",
"mongo_versions": [
"3.6",
"4.0",
"4.2",
"4.4",
"5.0"
],
"pull_requests": [
{
"pr": "25101",
"title": "[FIX] Database indexes not being created",
"userLogin": "sampaiodiego",
"milestone": "4.6.2",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "24933",
"title": "[FIX] Deactivating user breaks if user is the only room owner",
"userLogin": "sidmohanty11",
"description": "## Before\r\n\r\nhttps://user-images.githubusercontent.com/73601258/160000871-cfc2f2a5-2a59-4d27-8049-7754d003dd48.mp4\r\n\r\n\r\n\r\n## After\r\nhttps://user-images.githubusercontent.com/73601258/159998287-681ab475-ff33-4282-82ff-db751c59a392.mp4",
"milestone": "4.6.2",
"contributors": [
"sidmohanty11",
"sampaiodiego"
]
}
]
}
}
}
70 changes: 46 additions & 24 deletions .github/workflows/build_and_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,35 @@ jobs:
docker build -t $IMAGE_NAME .
docker push $IMAGE_NAME
release-versions:
runs-on: ubuntu-latest
outputs:
release: ${{ steps.by-tag.outputs.release }}
latest-release: ${{ steps.latest.outputs.latest-release }}
steps:
- id: by-tag
run: |
if echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
RELEASE="latest"
elif echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
RELEASE="release-candidate"
fi
echo "RELEASE: ${RELEASE}"
echo "::set-output name=release::${RELEASE}"
- id: latest
run: |
LATEST_RELEASE="$(
git -c 'versionsort.suffix=-' ls-remote -t --exit-code --refs --sort=-v:refname "https://github.com/$GITHUB_REPOSITORY" '*' |
sed -En '1!q;s/^[[:xdigit:]]+[[:space:]]+refs\/tags\/(.+)/\1/gp'
)"
echo "LATEST_RELEASE: ${LATEST_RELEASE}"
echo "::set-output name=latest-release::${LATEST_RELEASE}"
deploy:
runs-on: ubuntu-20.04
if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
needs: test
needs: [test, release-versions]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -626,10 +651,10 @@ jobs:
ARTIFACT_NAME="${REPO_VERSION}"
RC_VERSION=$GIT_TAG
if [[ $GIT_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
if [[ '${{ needs.release-versions.outputs.release }}' = 'release-candidate' ]]; then
SNAP_CHANNEL=candidate
RC_RELEASE=candidate
elif [[ $GIT_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
elif [[ '${{ needs.release-versions.outputs.release }}' = 'latest' ]]; then
SNAP_CHANNEL=stable
RC_RELEASE=stable
fi
Expand Down Expand Up @@ -676,7 +701,7 @@ jobs:
image-build:
runs-on: ubuntu-20.04
needs: deploy
needs: [deploy, release-versions]

strategy:
matrix:
Expand Down Expand Up @@ -739,11 +764,7 @@ jobs:
DOCKER_TAG="${DOCKER_TAG}-${{ matrix.release }}"
fi;
if echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
RELEASE="latest"
elif echo "$GITHUB_REF_NAME" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
RELEASE="release-candidate"
fi
RELEASE="${{ needs.release-versions.outputs.release }}"
if [[ '${{ matrix.release }}' = 'alpine' ]]; then
RELEASE="${RELEASE}-${{ matrix.release }}"
Expand All @@ -758,12 +779,7 @@ jobs:
docker push $IMAGE_NAME:$DOCKER_TAG
if [[ $RELEASE == 'latest' ]]; then
CURRENT_LATEST="$(
git -c 'versionsort.suffix=-' ls-remote -t --exit-code --refs --sort=-v:refname "https://github.com/$GITHUB_REPOSITORY" '*' |
sed -En '1!q;s/^[[:xdigit:]]+[[:space:]]+refs\/tags\/(.+)/\1/gp'
)"
echo "CURRENT_LATEST: $CURRENT_LATEST"
if [[ $CURRENT_LATEST == $GITHUB_REF_NAME ]]; then
if [[ '${{ needs.release-versions.outputs.latest-release }}' == $GITHUB_REF_NAME ]]; then
docker tag $IMAGE_NAME:$DOCKER_TAG $IMAGE_NAME:$RELEASE
docker push $IMAGE_NAME:$RELEASE
fi
Expand Down Expand Up @@ -792,7 +808,7 @@ jobs:
services-image-build:
runs-on: ubuntu-20.04
needs: deploy
needs: [deploy, release-versions]

strategy:
matrix:
Expand Down Expand Up @@ -828,17 +844,23 @@ jobs:
echo "Building Docker image for service: ${{ matrix.service }}:${IMAGE_TAG}"
docker build --build-arg SERVICE=${{ matrix.service }} -t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} .
docker build \
--build-arg SERVICE=${{ matrix.service }} \
-t rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} \
./apps/meteor/ee/server/services
docker push rocketchat/${{ matrix.service }}-service:${IMAGE_TAG}
if [[ $GITHUB_REF == refs/tags/* ]]; then
if echo "$IMAGE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$' ; then
RELEASE="latest"
elif echo "$IMAGE_TAG" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$' ; then
RELEASE="release-candidate"
RELEASE="${{ needs.release-versions.outputs.release }}"
if [[ $RELEASE == 'latest' ]]; then
if [[ '${{ needs.release-versions.outputs.latest-release }}' == $GITHUB_REF_NAME ]]; then
docker tag rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} rocketchat/${{ matrix.service }}-service:${RELEASE}
docker push rocketchat/${{ matrix.service }}-service:${RELEASE}
fi
else
docker tag rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} rocketchat/${{ matrix.service }}-service:${RELEASE}
docker push rocketchat/${{ matrix.service }}-service:${RELEASE}
fi
docker tag rocketchat/${{ matrix.service }}-service:${IMAGE_TAG} rocketchat/${{ matrix.service }}-service:${RELEASE}
docker push rocketchat/${{ matrix.service }}-service:${RELEASE}
fi
Loading

0 comments on commit 63c7802

Please sign in to comment.