Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into @radoslawkrzemien/136…
Browse files Browse the repository at this point in the history
…04-local-testing-of-github-actions

# Conflicts:
#	.github/workflows/cherryPick.yml
#	.github/workflows/createNewVersion.yml
#	.github/workflows/deploy.yml
#	.github/workflows/finishReleaseCycle.yml
#	.github/workflows/platformDeploy.yml
#	.github/workflows/preDeploy.yml
#	.github/workflows/testBuild.yml
#	.github/workflows/warnCPLabel.yml
#	package-lock.json
  • Loading branch information
radoslawkrzemien committed Jun 30, 2023
2 parents bc9cc47 + 0bbf3fc commit 2ce14ce
Show file tree
Hide file tree
Showing 357 changed files with 23,377 additions and 30,552 deletions.
17 changes: 17 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,20 @@ USE_WEB_PROXY=false
USE_WDYR=false
CAPTURE_METRICS=false
ONYX_METRICS=false

EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
EXPENSIFY_ACCOUNT_ID_ADMIN=-1
EXPENSIFY_ACCOUNT_ID_BILLS=-1
EXPENSIFY_ACCOUNT_ID_CHRONOS=-1
EXPENSIFY_ACCOUNT_ID_CONCIERGE=-1
EXPENSIFY_ACCOUNT_ID_CONTRIBUTORS=-1
EXPENSIFY_ACCOUNT_ID_FIRST_RESPONDER=-1
EXPENSIFY_ACCOUNT_ID_HELP=-1
EXPENSIFY_ACCOUNT_ID_INTEGRATION_TESTING_CREDS=-1
EXPENSIFY_ACCOUNT_ID_PAYROLL=-1
EXPENSIFY_ACCOUNT_ID_QA=-1
EXPENSIFY_ACCOUNT_ID_QA_TRAVIS=-1
EXPENSIFY_ACCOUNT_ID_RECEIPTS=-1
EXPENSIFY_ACCOUNT_ID_REWARDS=-1
EXPENSIFY_ACCOUNT_ID_STUDENT_AMBASSADOR=-1
EXPENSIFY_ACCOUNT_ID_SVFG=-1
2 changes: 1 addition & 1 deletion .github/actionlint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# See https://github.com/rhysd/actionlint/blob/main/docs/config.md
self-hosted-runner:
labels:
- ubuntu-20.04-64core
- ubuntu-latest-xl
- macos-12-xl
5 changes: 5 additions & 0 deletions .github/actions/composite/setupGitForOSBotify/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ runs:
git config commit.gpgsign true
git config user.name OSBotify
git config user.email [email protected]
- name: Enable debug logs for git
shell: bash
if: runner.debug == '1'
run: echo "GIT_TRACE=true" >> "$GITHUB_ENV"
145 changes: 0 additions & 145 deletions .github/actions/composite/updateProtectedBranch/action.yml

This file was deleted.

Loading

0 comments on commit 2ce14ce

Please sign in to comment.