Skip to content

Commit

Permalink
release-3.21 (#4272)
Browse files Browse the repository at this point in the history
  • Loading branch information
ffflorian authored Nov 30, 2020
2 parents c287763 + 72df634 commit 9dcb8b1
Show file tree
Hide file tree
Showing 106 changed files with 3,791 additions and 3,998 deletions.
6 changes: 4 additions & 2 deletions .babel-register.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const nodeEnvPreset = [
},
];

babelRegister({
const registerOptions = {
cache: false,
extensions: ['.ts'],
plugins: [
Expand All @@ -25,4 +25,6 @@ babelRegister({
'@babel/preset-typescript',
nodeEnvPreset,
],
});
}

babelRegister(registerOptions);
1 change: 0 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"minimizable",
"ntlm",
"nupkg",
"raygun",
"sandboxed",
"submenu",
"twitterbot",
Expand Down
31 changes: 31 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: 2
updates:
- package-ecosystem: npm
directory: '/'
schedule:
interval: daily
time: '07:00'
timezone: 'Europe/Berlin'
open-pull-requests-limit: 99
assignees:
- ffflorian
versioning-strategy: increase
ignore:
- dependency-name: '@types/node'
versions:
- '>= 13.x'
- dependency-name: electron
versions:
- '>= 10.x'
- dependency-name: electron-builder
versions:
- '>= 21.x'
- package-ecosystem: npm
directory: '/app-config'
schedule:
interval: weekly
day: sunday
open-pull-requests-limit: 99
assignees:
- ffflorian
versioning-strategy: increase
12 changes: 12 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
'type: refactoring 🛠':
title: '^refactor(\(.+\))?:.*'
'type: bug / fix 🐞':
title: '^(run)?fix(\(.+\))?:.*'
'type: chore 🧹':
title: '^chore(\(.+\))?:.*'
'type: documentation 📋':
title: '^docs(\(.+\))?:.*'
'type: feature / request ✨':
title: '^feat(\(.+\))?:.*'
'type: test 👷':
title: '^test(\(.+\))?:.*'
38 changes: 38 additions & 0 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Build and Test

on:
push:
branches: [main, staging, dev]
pull_request:
branches: [main, staging, dev]

jobs:
build_test:
name: Build and Test
strategy:
fail-fast: true
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.5.0
with:
access_token: ${{ github.token }}
- name: Checkout repository
uses: actions/checkout@v2
with:
fetch-depth: 2
- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 14.x
- name: Yarn cache
uses: c-hive/gha-yarn-cache@v1
- name: Install dependencies
run: yarn --frozen-lockfile
- name: Use xvfb-run on Linux
run: sed -i 's/\(electron-mocha \)/xvfb-run \1/g' package.json
if: contains(matrix.os, 'ubuntu')
- name: Test
run: yarn test
62 changes: 62 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
name: 'CodeQL'

on:
push:
branches: [dev, main, staging]
pull_request:
# The branches below must be a subset of the branches above
branches: [dev]
schedule:
- cron: '0 18 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
37 changes: 37 additions & 0 deletions .github/workflows/download_translations.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Download translations

on:
push:
branches:
- dev
schedule:
- cron: '0 6 * * *'

jobs:
download_translations:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Download translations
uses: crowdin/github-action@1.0.9
env:
GITHUB_TOKEN: ${{ github.token }}
CROWDIN_PROJECT_ID: 342373
with:
upload_sources: false
upload_translations: false
download_translations: true
skip_untranslated_files: false
# Download translations with pushing to branch
push_translations: true
commit_message: 'chore: Update translations'
localization_branch_name: 'chore/update-translations'
create_pull_request: true
pull_request_title: 'chore: Update translations'
token: ${{ secrets.CROWDIN_TOKEN }}
source: '/electron/locale/en-US.json'
translation: '/electron/locale/%locale%.json'
base_path: '.'
14 changes: 14 additions & 0 deletions .github/workflows/label.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Label PR

on:
pull_request:
types: [opened, synchronize]

jobs:
label:
name: Label PR based on title
runs-on: ubuntu-latest
steps:
- uses: srvaroa/labeler@v0.3
env:
GITHUB_TOKEN: ${{secrets.GH_TOKEN}}
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/wrap
/temp
/.github/issue_template.md
/resources
coverage
.nyc_output
instrumented-code
Expand Down
65 changes: 0 additions & 65 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Please check Wire's [global SECURITY.md](https://github.com/wireapp/wire/blob/master/SECURITY.md).
4 changes: 2 additions & 2 deletions app-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.26.0",
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.26.1-0"
"wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.27.5",
"wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.27.6-0"
}
}
16 changes: 14 additions & 2 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
// @ts-check
/* eslint-disable valid-jsdoc */

const plugins = ['@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-optional-chaining'];

/**
* @param {{debug?: boolean, modules?: false | string}} options
* @typedef {import('@babel/core').PluginItem} PluginItem
* @returns {PluginItem[]}
*/
const buildPresets = ({debug = false, modules = false}) => {
/** @type {PluginItem} */
const browserEnvPreset = [
'@babel/preset-env',
{
corejs: '2',
corejs: '3',
debug,
modules,
targets: {
Expand All @@ -17,7 +26,8 @@ const buildPresets = ({debug = false, modules = false}) => {
return ['@babel/preset-react', '@babel/preset-typescript', browserEnvPreset];
};

module.exports = {
/** @type {import('@babel/core').TransformOptions} */
const config = {
env: {
test: {
plugins,
Expand All @@ -27,3 +37,5 @@ module.exports = {
plugins,
presets: buildPresets({modules: false}),
};

module.exports = config;
2 changes: 1 addition & 1 deletion bin/bin-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see http://www.gnu.org/licenses/.
*/

import {LogFactory, Logger} from '@wireapp/commons/dist/commonjs/LogFactory';
import {LogFactory, Logger} from '@wireapp/commons/src/main/LogFactory';
import {exec} from 'child_process';
import commander from 'commander';
import fs from 'fs-extra';
Expand Down
1 change: 1 addition & 0 deletions bin/build-tools/lib/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface LinuxConfig {
}

export interface MacOSConfig {
appleExportComplianceCode: string | null;
bundleId: string;
category: string;
certNameApplication: string | null;
Expand Down
Loading

0 comments on commit 9dcb8b1

Please sign in to comment.