Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ci-trigger] git-diff-develop dependent-jobs (#27268) #27270

Draft
wants to merge 5 commits into
base: ci-fix-git-diff
Choose a base branch
from
+8 −5
Draft

[ci-trigger] git-diff-develop dependent-jobs (#27268) #27270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b64f97
chore: change spec file
legobeat Sep 19, 2024
8517be2
ci: trigger on targeting ci-fix-git-diff
legobeat Sep 19, 2024
397390f
chore: edit locale file to trigger validation script
legobeat Sep 19, 2024
d174ad0
chore: trigger locale validation ci job
legobeat Sep 19, 2024
c5bcacc
testfix
legobeat Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+)/
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .circleci/scripts/git-diff-develop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`;

/**
Expand Down
1 change: 1 addition & 0 deletions app/_locales/de/messages.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/e2e/tests/tokens/add-multiple-tokens.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
{
Expand Down
Loading