Skip to content

Commit b363514

Browse files
committed
revert: squash merge
1 parent 3bcf40b commit b363514

File tree

1,239 files changed

+39272
-12468
lines changed

Some content is hidden

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

1,239 files changed

+39272
-12468
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# ignore development certificates
2+
/server/certificate

.env.localhost

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ ENABLE_DEV_BACKEND_API="true"
2525
BACKEND_REST="https://staging-nginz-https.zinfra.io"
2626
BACKEND_WS="wss://staging-nginz-ssl.zinfra.io"
2727

28+
# imai
29+
# BACKEND_REST="https://nginz-https.imai.wire.link"
30+
# BACKEND_WS="https://nginz-ssl.imai.wire.link"
31+
2832
# production
2933
# BACKEND_REST="https://prod-nginz-https.wire.com"
3034
# BACKEND_WS="wss://prod-nginz-ssl.wire.com"

.github/labeler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
# Components
3434
'comp: calling':
3535
files:
36-
- 'src/script/calling/.*'
36+
- 'src/script/repositories/calling/.*'
3737
'comp: preferences':
3838
files:
39-
- 'src/script/properties/.*'
39+
- 'src/script/repositories/properties/.*'
4040
'comp: infrastructure':
4141
files:
4242
- '.elasticbeanstalk'

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
3838

3939
- name: Monitor coverage
40-
uses: codecov/codecov-action@v5.4.2
40+
uses: codecov/codecov-action@v5.5.0
4141
with:
4242
fail_ci_if_error: false
4343
files: ./coverage/lcov.info

.github/workflows/create_docker_image.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ jobs:
5959
DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
6060
run: yarn docker "${{inputs.tag}}-${{ steps.vars.outputs.sha_short }}"
6161

62-
- name: Install AWS CLI
63-
run: |
64-
sudo apt-get update
65-
sudo apt-get install -y awscli
66-
6762
- name: Upload unit-tests.log to S3
6863
env:
6964
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/generate_test_report.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ jobs:
5252
echo -e "COMMIT SHA = ${{ inputs.commit }}" >> ${{ env.UNIT_TEST_REPORT_FILE }}
5353
echo -e "TEST RUN DATE = $(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${{ env.UNIT_TEST_REPORT_FILE }}
5454
55-
- name: Install AWS CLI
56-
run: |
57-
sudo apt-get update
58-
sudo apt-get install -y awscli
59-
6055
- name: Upload unit-tests.log to S3
6156
env:
6257
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Playwright Critical Flow Tests
2+
3+
on:
4+
pull_request:
5+
# we want to run the CI on every PR targetting those branches
6+
branches: [dev]
7+
8+
jobs:
9+
smoke-tests:
10+
name: Run Playwright Critical Flow Tests
11+
if: github.repository == 'wireapp/wire-webapp'
12+
runs-on: [self-hosted, Linux, X64, office]
13+
14+
steps:
15+
- name: Checkout repository
16+
uses: actions/checkout@v4
17+
18+
- name: Setup Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: 18.16.x
22+
cache: 'yarn'
23+
24+
- name: Install JS dependencies
25+
run: yarn --immutable
26+
27+
- name: Install Playwright browsers
28+
run: yarn playwright install --with-deps && yarn playwright install chrome
29+
30+
- name: Install 1Password
31+
uses: 1password/install-cli-action@v1
32+
33+
- name: Generate env file
34+
run: op inject -i test/e2e_tests/.env.tpl -o test/e2e_tests/.env
35+
env:
36+
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
37+
38+
- name: Run critical flow tests
39+
run: yarn e2e-test --grep "@crit-flow-web"
40+
41+
- name: Upload test report
42+
if: always()
43+
uses: actions/upload-artifact@v4
44+
with:
45+
name: playwright-report
46+
path: playwright-report/
47+
48+
- name: Generate PR comment
49+
if: always()
50+
id: generate_comment
51+
run: |
52+
node test/e2e_tests/scripts/create-playwright-report-summary.js
53+
COMMENT=$(cat playwright-report-summary.txt)
54+
echo "comment<<EOF" >> $GITHUB_OUTPUT
55+
echo "$COMMENT" >> $GITHUB_OUTPUT
56+
echo "EOF" >> $GITHUB_OUTPUT
57+
58+
- name: Comment on PR
59+
if: always()
60+
uses: marocchino/sticky-pull-request-comment@v2
61+
with:
62+
header: playwright-summary
63+
message: |
64+
🔗 [Download Full Report Artifact](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
65+
66+
${{ steps.generate_comment.outputs.comment }}
67+
env:
68+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Playwright Regression Flow Tests
2+
3+
on:
4+
schedule:
5+
# we want to run this nightly on dev
6+
- cron: '0 05 * * 1-5'
7+
workflow_dispatch:
8+
9+
jobs:
10+
regression-tests:
11+
name: Run Playwright Regression Flow Tests
12+
if: github.repository == 'wireapp/wire-webapp'
13+
runs-on: [self-hosted, Linux, X64, office]
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Setup Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: 18.16.x
23+
cache: 'yarn'
24+
25+
- name: Install JS dependencies
26+
run: yarn --immutable
27+
28+
- name: Install Playwright browsers
29+
run: yarn playwright install --with-deps && yarn playwright install chrome
30+
31+
- name: Install 1Password
32+
uses: 1password/install-cli-action@v1
33+
34+
- name: Generate env file
35+
run: op inject -i test/e2e_tests/.env.tpl -o test/e2e_tests/.env
36+
env:
37+
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
38+
39+
- name: Run regression tests
40+
run: yarn e2e-test --grep "@regression|@crit-flow-web"
41+
42+
- name: Upload test report
43+
if: always()
44+
uses: actions/upload-artifact@v4
45+
with:
46+
name: playwright-report
47+
path: playwright-report/
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Playwright Smoke Tests
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
smoke-tests:
8+
name: Run Playwright Smoke Tests
9+
if: github.repository == 'wireapp/wire-webapp'
10+
runs-on: [self-hosted, Linux, X64, office]
11+
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
16+
- name: Setup Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: 18.16.x
20+
cache: 'yarn'
21+
22+
- name: Install JS dependencies
23+
run: yarn --immutable
24+
25+
- name: Install Playwright browsers
26+
run: yarn playwright install --with-deps && yarn playwright install chrome
27+
28+
- name: Install 1Password
29+
uses: 1password/install-cli-action@v1
30+
31+
- name: Generate env file
32+
run: op inject -i test/e2e_tests/.env.tpl -o test/e2e_tests/.env
33+
env:
34+
OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
35+
36+
- name: Run smoke tests
37+
run: yarn e2e-test --grep "@smoke"
38+
39+
- name: Upload test report
40+
if: always()
41+
uses: actions/upload-artifact@v4
42+
with:
43+
name: playwright-report
44+
path: playwright-report/

.github/workflows/publish.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,6 @@ jobs:
7777
name: 'unit-tests-report'
7878
path: ${{env.UNIT_TEST_REPORT_FILE}}
7979

80-
- name: Install AWS CLI
81-
run: |
82-
sudo apt-get update
83-
sudo apt-get install -y awscli
84-
8580
- name: Upload unit-tests.log to S3
8681
env:
8782
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -308,6 +303,7 @@ jobs:
308303
deploy_to_aws:
309304
name: 'Deploy to live environments'
310305
runs-on: ubuntu-latest
306+
environment: ${{ matrix.target }}
311307
needs: [build, set_deployment_targets]
312308
if: ${{needs.set_deployment_targets.outputs.deployment_targets}}
313309

0 commit comments

Comments
 (0)