Release 2024-02-12 - (expected chart version 4.40.0)

.envrc

@@ -13,15 +13,24 @@ store_paths=$(echo "$nix_files" | xargs nix-store --add ./nix)
 layout_dir=$(direnv_layout_dir)
 env_dir=./.env
 
+export NIX_CONFIG='extra-experimental-features = nix-command'
+
 [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
 
 if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
-  nix-build ./nix -A wireServer.devEnv --out-link ./.env
-
+  bcmd=nix
+  if command -v nom &> /dev/null; then
+    if [[ "${USE_NOM}" != "0" ]]; then
+      bcmd=nom
+    fi
+  fi
+  echo "🔧 Building environment"
+  $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env
   echo "$store_paths" > "$layout_dir/nix-rebuild"
 fi
 
 PATH_add "./.env/bin"
+PATH_add "./.env-hs-run/bin"
 path_add "PKG_CONFIG_PATH" "./.env/lib/pkgconfig"
 path_add "LIBRARY_PATH" "./.env/lib"
 path_add "PYTHONPATH" "./hack/python"
@@ -32,9 +41,6 @@ PATH_add "./dist"
 # e.g. "nix-shell -p foo" will get "foo" for pkgs defined in ./nix/default.nix
 [[ -f "./.env/.profile" ]] && source_env "./.env/.profile"
 
-# allow local .envrc overrides
-[[ -f .envrc.local ]] && source_env .envrc.local
-
 # Locale
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
@@ -51,3 +57,9 @@ export INTEGRATION_DYNAMIC_BACKENDS_POOLSIZE=3
 export AWS_REGION="eu-west-1"
 export AWS_ACCESS_KEY_ID="dummykey"
 export AWS_SECRET_ACCESS_KEY="dummysecret"
+
+# integration test suite timeout 
+export TEST_TIMEOUT_SECONDS=2
+
+# allow local .envrc overrides
+[[ -f .envrc.local ]] && source_env .envrc.local

.github/workflows/ci.yml

@@ -4,24 +4,6 @@ on:
    branches: [master, develop]
 
 jobs:
-  treefmt:
-   name: Run treefmt
-   runs-on: ubuntu-latest
-   steps:
-     - uses: actions/checkout@v2
-       with:
-         submodules: true
-     - uses: cachix/install-nix-action@v20
-     - uses: cachix/cachix-action@v12
-       with:
-         name: wire-server
-         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-         authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-     - name: Install treefmt and nixpkgs-fmt (without pulling in all of dev-env)
-       run: nix-env -if nix/default.nix -iA pkgs.treefmt pkgs.nixpkgs-fmt pkgs.shellcheck
-     - name: Run treefmt
-       run: treefmt
-
   build-docs:
     name: Build docs
     runs-on: ubuntu-latest

.gitignore

@@ -40,25 +40,6 @@ services/nginz/src
 services/.env
 tools/api-simulations/mailboxes.json
 tools/api-simulations/reports
-brig-schema.yaml
-brig.yaml
-brig.integration-aws.yaml
-cannon.yaml
-cannon.integration-aws.yaml
-cannon2.integration-aws.yaml
-cargohold.yaml
-cargohold.integration-aws.yaml
-galley-schema.yaml
-galley.yaml
-galley.integration-aws.yaml
-gundeck-schema.yaml
-gundeck.yaml
-gundeck.integration-aws.yaml
-proxy.yaml
-proxy.integration-aws.yaml
-spar.yaml
-spar.integration-aws.yaml
-integration-aws.yaml
 DOCKER_ID*
 swagger-ui
 
@@ -105,6 +86,7 @@ result-*
 # Created by .envrc
 .direnv
 .env
+.env-hs-run
 
 # emacs misc
 .dir-locals.el
@@ -114,3 +96,6 @@ result-*
 
 services/nginz/third_party/headers-more-nginx-module
 services/nginz/third_party/nginx-module-vts
+
+# dumped out by running tests in kind
+logs-integration