Skip to content

Commit

Permalink
Merge pull request #3493 from wireapp/release_2023-08-11_09_14
Browse files Browse the repository at this point in the history
  • Loading branch information
fisx authored Aug 11, 2023
2 parents fae07f2 + 2afce29 commit 8686e30
Show file tree
Hide file tree
Showing 1,420 changed files with 30,618 additions and 24,402 deletions.
15 changes: 15 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ fi
PATH_add "./.env/bin"
path_add "PKG_CONFIG_PATH" "./.env/lib/pkgconfig"
path_add "LIBRARY_PATH" "./.env/lib"
path_add "PYTHONPATH" "./hack/python"
PATH_add "./dist"

# source .profile from `$env`. This sets NIX_PATH to pkgs defined in
# ./nix/default.nix. Tis is useful for nix tooling that runs inside this direnv,
Expand All @@ -36,3 +38,16 @@ path_add "LIBRARY_PATH" "./.env/lib"
# Locale
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8

# RabbitMQ
export RABBITMQ_USERNAME=guest
export RABBITMQ_PASSWORD=alpaca-grapefruit

# Integration tests
export INTEGRATION_DYNAMIC_BACKENDS_POOLSIZE=3

# AWS credentials for locally running services
# Keep these in sync with deploy/dockerephmeral/init.sh
export AWS_REGION="eu-west-1"
export AWS_ACCESS_KEY_ID="dummykey"
export AWS_SECRET_ACCESS_KEY="dummysecret"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target
.#*
*#*#
.*.sw[a-z]
**/__pycache__
.cabal-sandbox
ID
cabal.sandbox.config
Expand Down
5 changes: 4 additions & 1 deletion .hlint.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# We need quasi quotes support.
- arguments: [ -XQuasiQuotes, --color ]
- arguments: [ -XQuasiQuotes, -XOverloadedRecordDot, --color ]

# Used to enforce ormolu styling. Can be revisited if we change formatters.
- ignore: { name: Redundant $ }
Expand All @@ -25,3 +25,6 @@
Federator.Response, # this is just a naming conincidence
Cannon.Run # we do something similar, but not identical here by hand
] }

# ormolu disagrees with this (and also some of us devs, sometimes):
- ignore: { name: Redundant bracket }
Loading

0 comments on commit 8686e30

Please sign in to comment.