Skip to content

Commit 0eca67b

Browse files
ArtemHoruzhenkoArtemHoruzhenko
committed
Merge branch 'main' into merge/release-2.64.1
# Conflicts: # redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.service.ts
2 parents 08db0c9 + da0712c commit 0eca67b

File tree

478 files changed

+9969
-3388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

478 files changed

+9969
-3388
lines changed

‎.circleci/build/build.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
2828
COPY --chown=node:node ./docker-entry.sh ./
2929
RUN chmod +x docker-entry.sh
3030

31-
# since RI is hard-code to port 5000, expose it from the container
32-
EXPOSE 5000
31+
# since RI is hard-code to port 5540, expose it from the container
32+
EXPOSE 5540
3333

3434
# don't run the node process as root
3535
USER node

‎.github/actions/deploy-test-reports/action.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ inputs:
66
description: Group matching the artifacts
77
required: false
88
default: '*'
9+
path:
10+
description: Path for link to the report
11+
required: false
12+
default: ''
913

1014
AWS_BUCKET_NAME_TEST:
1115
required: true
@@ -46,4 +50,9 @@ runs:
4650
4751
aws s3 cp public/ s3://${AWS_BUCKET_NAME_TEST}/public/${SUB_PATH} --recursive
4852
53+
- name: Add link to report in the workflow summary
54+
shell: bash
55+
run: |
56+
link="${{ inputs.path }}/index.html"
4957
58+
echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY

‎.github/build/build.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ RUN mkdir -p /data && chown -R node:node /data
2828
COPY --chown=node:node ./docker-entry.sh ./
2929
RUN chmod +x docker-entry.sh
3030

31-
# since RI is hard-code to port 5000, expose it from the container
32-
EXPOSE 5000
31+
# since RI is hard-code to port 5540, expose it from the container
32+
EXPOSE 5540
3333

3434
# don't run the node process as root
3535
USER node

‎.github/redisinsight_browser.png‎

-547 KB
Loading

‎.github/workflows/tests-backend.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
curl -H "Content-type: application/json" --data @$WORKDIR/slack.$FILENAME -H "Authorization: Bearer $SLACK_AUDIT_REPORT_KEY" -X POST https://slack.com/api/chat.postMessage
5252
5353
- name: Unit tests API
54+
timeout-minutes: 20
5455
run: yarn --cwd redisinsight/api/ test:cov --ci --silent
5556

5657
- name: Upload Test Report
@@ -60,24 +61,20 @@ jobs:
6061
name: ${{ env.REPORT_NAME }}
6162
path: redisinsight/api/report
6263

64+
- name: Get current date
65+
id: date
66+
if: always()
67+
uses: ./.github/actions/get-current-date
68+
6369
- name: Deploy report
6470
uses: ./.github/actions/deploy-test-reports
6571
if: always()
6672
with:
6773
group: 'report'
74+
path: "${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}"
6875
AWS_BUCKET_NAME_TEST: ${{ vars.AWS_BUCKET_NAME_TEST }}
6976
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
7077
AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
7178
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7279
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
7380

74-
- name: Get current date
75-
id: date
76-
if: always()
77-
uses: ./.github/actions/get-current-date
78-
79-
- name: Add link to report in the workflow summary
80-
if: always()
81-
run: |
82-
link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}/index.html"
83-
echo "[${link}](${link})" >> $GITHUB_STEP_SUMMARY

‎.github/workflows/tests-e2e-appimage.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
fluxbox &
7777
7878
- name: Run tests
79+
timeout-minutes: 60
7980
run: |
8081
.github/e2e/test.app-image.sh
8182
@@ -103,26 +104,20 @@ jobs:
103104
list-suites: 'failed'
104105
fail-on-error: 'false'
105106

107+
- name: Get current date
108+
id: date
109+
if: always()
110+
uses: ./.github/actions/get-current-date
111+
106112
# Deploy report to AWS test bucket
107113
- name: Deploy report
108114
uses: ./.github/actions/deploy-test-reports
109115
if: always()
110116
with:
111117
group: 'report'
118+
path: "${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}"
112119
AWS_BUCKET_NAME_TEST: ${{ vars.AWS_BUCKET_NAME_TEST }}
113120
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
114121
AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
115122
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
116123
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
117-
118-
- name: Get current date
119-
id: date
120-
if: always()
121-
uses: ./.github/actions/get-current-date
122-
123-
- name: Add link to report in the workflow summary
124-
if: always()
125-
run: |
126-
link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}/index.html"
127-
echo "[${link}](${link})" >> $GITHUB_STEP_SUMMARY
128-

‎.github/workflows/tests-e2e-docker.yml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,15 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
# Number of threads to run tests
40-
parallel: [0, 1, 2, 3]
40+
parallel: [0, 1, 2, 3, 4, 5]
4141

4242
steps:
4343
- uses: actions/checkout@v4
4444

45+
- name: Get current date
46+
id: date
47+
uses: ./.github/actions/get-current-date
48+
4549
# SSH Debug
4650
- name: Enable SSH
4751
uses: mxschmitt/action-tmate@v3
@@ -62,7 +66,7 @@ jobs:
6266
- name: Generate short list of the test files
6367
working-directory: ./tests/e2e
6468
run: |
65-
testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 4 == ${{ matrix.parallel }}")
69+
testFiles=$(find tests/web -type f -name '*.e2e.ts' | sort | awk "NR % 6 == ${{ matrix.parallel }}")
6670
6771
echo $testFiles
6872
@@ -72,6 +76,7 @@ jobs:
7276
echo "EOF" >> $GITHUB_ENV
7377
7478
- name: Run tests
79+
timeout-minutes: 80
7580
run: |
7681
export NODE_INDEX=${{ matrix.parallel }}
7782
@@ -112,18 +117,10 @@ jobs:
112117
uses: ./.github/actions/deploy-test-reports
113118
with:
114119
group: 'report'
120+
path: "${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}"
115121
AWS_BUCKET_NAME_TEST: ${{ vars.AWS_BUCKET_NAME_TEST }}
116122
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
117123
AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
118124
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
119125
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
120126

121-
- name: Add link to report in the workflow summary
122-
if: always()
123-
run: |
124-
DATE=$(date +'%Y-%m-%d')
125-
link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${DATE}/${{ github.run_id }}/${{ env.REPORT_NAME }}-${{ matrix.parallel }}/index.html"
126-
127-
echo "- [${link}](${link})" >> $GITHUB_STEP_SUMMARY
128-
129-

‎.github/workflows/tests-frontend.yml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
curl -H "Content-type: application/json" --data @$WORKDIR/slack.$FILENAME -H "Authorization: Bearer $SLACK_AUDIT_REPORT_KEY" -X POST https://slack.com/api/chat.postMessage
5050
5151
- name: Unit tests UI
52+
timeout-minutes: 30
5253
run: yarn test:cov --ci --silent
5354

5455
- name: Upload Test Report
@@ -58,24 +59,19 @@ jobs:
5859
name: ${{ env.REPORT_NAME }}
5960
path: report
6061

62+
- name: Get current date
63+
id: date
64+
if: always()
65+
uses: ./.github/actions/get-current-date
66+
6167
- name: Deploy report
6268
uses: ./.github/actions/deploy-test-reports
6369
if: always()
6470
with:
6571
group: 'report'
72+
path: "${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}"
6673
AWS_BUCKET_NAME_TEST: ${{ vars.AWS_BUCKET_NAME_TEST }}
6774
AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
6875
AWS_DISTRIBUTION_ID: ${{ secrets.AWS_DISTRIBUTION_ID }}
6976
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7077
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
71-
72-
- name: Get current date
73-
id: date
74-
if: always()
75-
uses: ./.github/actions/get-current-date
76-
77-
- name: Add link to report in the workflow summary
78-
if: always()
79-
run: |
80-
link="${{ vars.DEFAULT_TEST_REPORTS_URL }}/${{ steps.date.outputs.date }}/${{ github.run_id }}/${{ env.REPORT_NAME }}/index.html"
81-
echo "[${link}](${link})" >> $GITHUB_STEP_SUMMARY

‎.github/workflows/tests-integration.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,19 @@ jobs:
114114
run: |
115115
docker image load -i ./release/docker/docker-linux-alpine.amd64.tar
116116
117+
- name: Make sure coverage dir exists
118+
# Important: this directory is mounted on both the `app` and `test` Docker containers.
119+
run: mkdir -p ./redisinsight/api/test/test-runs/coverage
120+
117121
- name: Run tests
122+
timeout-minutes: 20
118123
run: |
119124
if [ ${{ inputs.redis_client }} == "node-redis" ]; then
120125
export RI_REDIS_CLIENTS_FORCE_STRATEGY=${{ inputs.redis_client }}
121126
fi
122127
123128
./redisinsight/api/test/test-runs/start-test-run.sh -r ${{ matrix.rte }} -t ${{ inputs.build }}
124-
mkdir -p mkdir itest/coverages && mkdir -p itest/results
129+
mkdir -p itest/coverages && mkdir -p itest/results
125130
126131
cp ./redisinsight/api/test/test-runs/coverage/test-run-result.json ./itest/results/${{ matrix.rte }}.result.json
127132
cp ./redisinsight/api/test/test-runs/coverage/test-run-result.xml ./itest/results/${{ matrix.rte }}.result.xml

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,5 @@ licenses
8585

8686
# caches
8787
.temp_cache
88+
89+
static/

0 commit comments

Comments
 (0)