-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/prod-beta' into prod-stable
- Loading branch information
Showing
166 changed files
with
6,312 additions
and
3,615 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
| set -x | ||
|
|
||
| # If current dev branch is master, push to build repo stage-beta | ||
| if [[ "${TRAVIS_BRANCH}" = "master" || "${TRAVIS_BRANCH}" = "main" ]]; then | ||
| .travis/release.sh "ci-beta" | ||
|
|
||
| # Release stage | ||
| rm -rf $APP_BUILD_DIR/.git | ||
| .travis/release.sh "stage-beta" | ||
| fi | ||
|
|
||
| # If current dev branch is deployment branch, push to build repo | ||
| if [[ "${TRAVIS_BRANCH}" = "ci-stable" || "${TRAVIS_BRANCH}" = "stage-stable" || "${TRAVIS_BRANCH}" = "prod-beta" || "${TRAVIS_BRANCH}" = "prod-stable" ]]; then | ||
| .travis/release.sh "${TRAVIS_BRANCH}" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| #!/bin/sh | ||
|
|
||
| default() | ||
| { | ||
| PATH=/usr/bin:/usr/sbin:${PATH} | ||
| export PATH | ||
|
|
||
| SCRIPT=`basename $0` | ||
| SCRIPT_DIR=`dirname $0` | ||
| SCRIPT_DIR=`cd $SCRIPT_DIR; pwd` | ||
|
|
||
| MAIN_BRANCH="master" | ||
| CI_STABLE_BRANCH="ci-stable" | ||
| STAGE_STABLE_BRANCH="stage-stable" | ||
| REACT_INTL_BRANCH="react-intl_changeover" | ||
|
|
||
| KOKU_UI_REPO="git@github.com:project-koku/koku-ui.git" | ||
|
|
||
| TMP_DIR="/tmp/$SCRIPT.$$" | ||
| KOKU_UI_DIR="$TMP_DIR/koku-ui" | ||
| } | ||
|
|
||
| usage() | ||
| { | ||
| cat <<- EEOOFF | ||
| This script will rebase the selected branch with $MAIN_BRANCH, then push changes to origin. | ||
| FYI, there are no ci-beta and stage-beta branches -- we push to https://github.com/RedHatInsights/cost-management-build via Travis builds | ||
| Note: The QA environment is no longer supported. | ||
| sh [-x] $SCRIPT [-h] -<c|q|s|r> | ||
| OPTIONS: | ||
| h Display this message | ||
| c CI stable | ||
| s Stage stable | ||
| r React Intl | ||
| EEOOFF | ||
| } | ||
|
|
||
| # main() | ||
| { | ||
| default | ||
|
|
||
| while getopts hcqsr c; do | ||
| case $c in | ||
| c) BRANCH=$CI_STABLE_BRANCH;; | ||
| s) BRANCH=$STAGE_STABLE_BRANCH;; | ||
| r) BRANCH=$REACT_INTL_BRANCH;; | ||
| h) usage; exit 0;; | ||
| \?) usage; exit 1;; | ||
| esac | ||
| done | ||
|
|
||
| if [ -z "$BRANCH" ]; then | ||
| usage | ||
| exit 1 | ||
| fi | ||
|
|
||
| mkdir $TMP_DIR | ||
| cd $TMP_DIR | ||
|
|
||
| git clone $KOKU_UI_REPO | ||
| cd $KOKU_UI_DIR | ||
|
|
||
| git checkout $BRANCH | ||
| git rebase $MAIN_BRANCH | ||
|
|
||
| if [ "$?" -eq 0 ]; then | ||
| git push -u origin $BRANCH | ||
| else | ||
| echo "Did not push to origin. No changes or check for conflicts" | ||
| fi | ||
|
|
||
| rm -rf $TMP_DIR | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,10 @@ | ||
| const sync = require('i18next-json-sync').default; | ||
| const { syncLocales } = require('i18next-locales-sync'); | ||
| const path = require('path'); | ||
| const srcDir = path.resolve(__dirname, '../src/locales'); | ||
|
|
||
| const check = process.argv.includes('--check'); | ||
| const srcDir = path.resolve(__dirname, '../src'); | ||
|
|
||
| sync({ | ||
| check, | ||
| files: path.join(srcDir, '**/locales/*.json'), | ||
| primary: 'en', | ||
| createResources: [], | ||
| space: 2, | ||
| lineEndings: 'LF', | ||
| finalNewline: true | ||
| syncLocales({ | ||
| primaryLanguage: 'en', | ||
| secondaryLanguages: ['de', 'ja'], | ||
| localesFolder: srcDir, | ||
| // overridePluralRules: pluralResolver => pluralResolver.addRule('he', pluralResolver.getRule('en')), | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.