Skip to content

Commit

Permalink
Merge branch 'staging' into dependabot/npm_and_yarn/typescript-eslint…
Browse files Browse the repository at this point in the history
…/eslint-plugin-6.7.0
  • Loading branch information
tlebon authored Jan 23, 2024
2 parents 35abc15 + bfbaa5e commit c348e35
Show file tree
Hide file tree
Showing 9 changed files with 1,141 additions and 839 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-to-test-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
with:
fetch-depth: 0
- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x
cache: 'yarn'
- name: Install JS dependencies
run: yarn --immutable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
access_token: ${{github.token}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync_translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
uses: actions/checkout@v3

- name: Download translations
uses: crowdin/github-action@v1.11.0
uses: crowdin/github-action@v1.16.1
env:
GITHUB_TOKEN: ${{github.token}}
CROWDIN_PROJECT_ID: 342361
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
uses: andymckay/[email protected]

- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
uses: styfle/cancel-workflow-action@0.12.0
with:
access_token: ${{github.token}}

Expand All @@ -73,15 +73,14 @@ jobs:
run: yarn --immutable

- name: Test
if: matrix.DISTRIBUTION == 'DISTRIBUTION_0'
run: yarn test

- name: Monitor coverage
if: github.event_name == 'pull_request' && matrix.DISTRIBUTION == 'DISTRIBUTION_0'
if: github.event_name == 'pull_request' && ! contains(github.event.pull_request.user.login, 'dependabot[bot]')
uses: slavcodev/[email protected]
with:
github_token: ${{github.token}}
clover_file: 'coverage/clover.xml'
coverage_path: 'coverage/clover.xml'
threshold_alert: ${{env.TEST_COVERAGE_FAIL_THRESHOLD}}
threshold_warning: ${{env.TEST_COVERAGE_WARNING_THRESHOLD}}

Expand Down Expand Up @@ -114,7 +113,7 @@ jobs:
- name: Storing release information
if: env.TAG != '' && matrix.DISTRIBUTION == 'DISTRIBUTION_0'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: release-info.json
path: ./release-info.json
Expand Down Expand Up @@ -196,7 +195,7 @@ jobs:
# INFO: https://github.com/wireapp/wire-webapp/blob/062ae4e1c23fa0b33dafae9cc0acf9a94fa8ad1a/.github/workflows/test_build_deploy.yml#L351-L356
- name: Obtaining release information artifact
id: release-info-artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
continue-on-error: true
with:
name: release-info.json
Expand Down Expand Up @@ -230,7 +229,7 @@ jobs:
- name: Creating Pull Request
id: create-pr
if: ${{ steps.release-info-file.outputs.exists == 'true' }}
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@v5
with:
draft: false
token: ${{ secrets.ZEBOT_GH_TOKEN }}
Expand All @@ -249,7 +248,7 @@ jobs:
echo "PR: ${{ steps.create-pr.outputs.pull-request-url }}"
- name: Delete release artifact
uses: geekyeggo/delete-artifact@v2
uses: geekyeggo/delete-artifact@v4
with:
failOnError: false
name: |
Expand Down
6 changes: 3 additions & 3 deletions bin/translations_download.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const getProjectAPIKey = () => {

const projectAPIKey = getProjectAPIKey();

const CROWDIN_API = 'https://api.crowdin.com/api/project/wire-account';
const CROWDIN_API = 'https://api.crowdin.com/api/v2/projects/342361';

const CROWDIN_URL = {
DOWNLOAD: `${CROWDIN_API}/download/all.zip?key=${projectAPIKey}`,
Expand All @@ -53,7 +53,7 @@ function fetchUpdates() {
https.get(CROWDIN_URL.EXPORT, response => {
if (response.statusCode < 200 || response.statusCode > 299) {
// eslint-disable-next-line prefer-promise-reject-errors
reject(`Failed to export, status code: ${response.statusCode}`);
reject(`Failed to export, status code: ${response.statusCode} ${response.statusMessage}`);
}
response.on('data', resolve);
response.on('error', reject);
Expand All @@ -68,7 +68,7 @@ function download() {
https.get(CROWDIN_URL.DOWNLOAD, response => {
if (response.statusCode < 200 || response.statusCode > 299) {
// eslint-disable-next-line prefer-promise-reject-errors
reject(`Failed to download, status code: ${response.statusCode}`);
reject(`Failed to download, status code: ${response.statusCode} ${response.statusMessage}`);
}

response.on('error', reject);
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"url-search-params-polyfill": "8.2.3"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.23.7",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.22.5",
Expand All @@ -32,7 +32,7 @@
"@types/color": "3.0.3",
"@types/enzyme": "3.10.12",
"@types/jest": "27.5.0",
"@types/node": "18.16.3",
"@types/node": "20.11.5",
"@types/react": "17.0.43",
"@types/react-dom": "17.0.14",
"@types/react-router-dom": "5.3.3",
Expand Down Expand Up @@ -79,7 +79,7 @@
"webpack": "5.87.0",
"webpack-bundle-analyzer": "4.9.0",
"webpack-cli": "4.10.0",
"webpack-dev-middleware": "5.3.3",
"webpack-dev-middleware": "6.1.1",
"webpack-hot-middleware": "2.25.3"
},
"husky": {
Expand Down
14 changes: 7 additions & 7 deletions server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
"http-proxy-middleware": "2.0.6",
"logdown": "3.3.1",
"moment": "2.29.4",
"nocache": "3.0.4",
"nocache": "4.0.0",
"pm2": "5.2.2",
"uuid": "9.0.0"
"uuid": "9.0.1"
},
"devDependencies": {
"@babel/core": "7.22.5",
"@babel/core": "7.23.7",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/preset-env": "7.22.5",
"@babel/preset-env": "7.23.8",
"@babel/preset-react": "7.22.5",
"@types/dotenv": "8.2.0",
"@types/express": "4.17.17",
Expand All @@ -28,7 +28,7 @@
"@types/helmet": "4.0.0",
"@types/moment": "2.13.0",
"@types/request": "2.48.8",
"@types/uuid": "8.3.4",
"@types/uuid": "9.0.7",
"@wireapp/tslint-config": "1.4.1",
"cross-env": "7.0.3",
"generate-changelog": "1.8.0",
Expand All @@ -38,9 +38,9 @@
"opn": "6.0.0",
"prettier": "2.8.8",
"request": "2.88.2",
"rimraf": "3.0.2",
"rimraf": "5.0.1",
"typescript": "4.9.5",
"webpack-dev-middleware": "5.3.3",
"webpack-dev-middleware": "6.1.1",
"webpack-hot-middleware": "2.25.3"
},
"name": "wire-web-server",
Expand Down
Loading

0 comments on commit c348e35

Please sign in to comment.