Skip to content

Commit

Permalink
Merge branch 'master' into fix-tenant-error-page-skipped
Browse files Browse the repository at this point in the history
  • Loading branch information
willvedd authored Aug 23, 2022
2 parents afe5e02 + 4f16194 commit 4b28934
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 77 deletions.
142 changes: 70 additions & 72 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test:coverage": "nyc npm run test; nyc report --reporter=lcov",
"build": "rimraf ./lib && npx tsc",
"dev": "npx tsc --watch",
"prepare": "npm run build",
"prepublishOnly": "npm run build",
"preversion": "kacl prerelease",
"version": "kacl release && git add CHANGELOG.md"
},
Expand Down
14 changes: 10 additions & 4 deletions test/e2e/e2e-cli.sh
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
#!/bin/sh

npm run build
set -e

WORK_DIR="./local/cli"
CONFIG_FILE="./config-cli-e2e.json"

npm ci #Install all dependencies to allow for building
npm run build
npm ci --omit=dev #Remove dev dependencies

TARBALL_PATH=$(npm pack)
sudo npm install -g $TARBALL_PATH

echo "{
\"AUTH0_DOMAIN\": \"$AUTH0_E2E_TENANT_DOMAIN\",
\"AUTH0_CLIENT_ID\": \"$AUTH0_E2E_CLIENT_ID\",
\"AUTH0_CLIENT_SECRET\": \"$AUTH0_E2E_CLIENT_SECRET\"
}" > $CONFIG_FILE

node lib/index.js export --env=false --output_folder=$WORK_DIR --format=yaml -c=$CONFIG_FILE
a0deploy export --env=false --output_folder=$WORK_DIR --format=yaml -c=$CONFIG_FILE

echo "-------- Beginning deploy/import phase --------"

node lib/index.js import --env=false --input_file=$WORK_DIR --format=yaml -c=$CONFIG_FILE
a0deploy import --env=false --input_file=$WORK_DIR --format=yaml -c=$CONFIG_FILE

rm $CONFIG_FILE
rm $TARBALL_PATH

0 comments on commit 4b28934

Please sign in to comment.