diff --git a/.circleci/config.yml b/.circleci/config.yml index 98b228012952..57a4b8c64f97 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,7 @@ develop_master_rc_only: &develop_master_rc_only filters: branches: only: + - ci-fix-git-diff - develop - master - /^Version-v(\d+)[.](\d+)[.](\d+)/ @@ -355,9 +356,10 @@ workflows: locales_only: when: - matches: - pattern: /^l10n_crowdin_action$/ - value: << pipeline.git.branch >> + not: + matches: + pattern: /^l10n_crowdin_action$/ + value: << pipeline.git.branch >> jobs: - prep-deps - get-changed-files-with-git-diff diff --git a/.circleci/scripts/git-diff-develop.ts b/.circleci/scripts/git-diff-develop.ts index 42adff728174..b1a76f4c179f 100644 --- a/.circleci/scripts/git-diff-develop.ts +++ b/.circleci/scripts/git-diff-develop.ts @@ -5,7 +5,7 @@ import { promisify } from 'util'; const exec = promisify(execCallback); -const MAIN_BRANCH = 'develop'; +const MAIN_BRANCH = 'ci-fix-git-diff'; const SOURCE_BRANCH = `refs/pull/${process.env.CIRCLE_PR_NUMBER}/head`; /** diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json index ff0773178691..ba37108d6b97 100644 --- a/app/_locales/de/messages.json +++ b/app/_locales/de/messages.json @@ -1,5 +1,6 @@ { "QRHardwareInvalidTransactionTitle": { + "foo": "bar", "message": "Fehler" }, "QRHardwareMismatchedSignId": { diff --git a/test/e2e/tests/tokens/add-multiple-tokens.spec.js b/test/e2e/tests/tokens/add-multiple-tokens.spec.js index 490460e770cb..db4a2fdd5bd9 100644 --- a/test/e2e/tests/tokens/add-multiple-tokens.spec.js +++ b/test/e2e/tests/tokens/add-multiple-tokens.spec.js @@ -11,7 +11,7 @@ const { const FixtureBuilder = require('../../fixture-builder'); describe('Multiple ERC20 Watch Asset', function () { - // TODO: This assertion will change once the method is fixed. + // TODO: This assertion will change once the method is fixed it('should show multiple erc20 watchAsset token list, only confirms one bug', async function () { await withFixtures( {