@suffolklitlab/alkiln 5.0.2-feat-github-server-2 → 5.0.2-feat-github-server-3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -56,6 +56,6 @@ jobs:
|
|
|
56
56
|
SERVER_URL: "${{ steps.github_server.outputs.SERVER_URL }}"
|
|
57
57
|
DOCASSEMBLE_DEVELOPER_API_KEY: "${{ steps.github_server.outputs.DOCASSEMBLE_DEVELOPER_API_KEY }}"
|
|
58
58
|
INSTALL_METHOD: "server"
|
|
59
|
-
ALKILN_VERSION: "5.0.2-feat-github-server-
|
|
59
|
+
ALKILN_VERSION: "5.0.2-feat-github-server-3"
|
|
60
60
|
- run: echo "Finished running ALKiln tests"
|
|
61
61
|
|
package/github_server/action.yml
CHANGED
|
@@ -26,6 +26,7 @@ runs:
|
|
|
26
26
|
- name: "github_server: Set environment variables"
|
|
27
27
|
run: |
|
|
28
28
|
echo "DA_ADMIN_API_KEY=abcd1234abcd1234abcd5678abdc5678" >> $GITHUB_ENV
|
|
29
|
+
echo "MAX_SECONDS_FOR_DOCKER=${{ inputs.MAX_SECONDS_FOR_DOCKER }}" >> $GITHUB_ENV
|
|
29
30
|
shell: bash
|
|
30
31
|
- id: api_key_output_step
|
|
31
32
|
run: echo "::set-output name=DOCASSEMBLE_DEVELOPER_API_KEY::$DA_ADMIN_API_KEY"
|
|
@@ -41,14 +42,14 @@ runs:
|
|
|
41
42
|
run: |
|
|
42
43
|
# github_server: Wait for server to start
|
|
43
44
|
|
|
45
|
+
# Reset the SECONDS variable
|
|
46
|
+
SECONDS=60
|
|
44
47
|
# Wait 1 minute before pinging the server constantly
|
|
45
|
-
sleep
|
|
48
|
+
sleep $SECONDS
|
|
46
49
|
|
|
47
50
|
# Use a variable we can control to avoid race conditions from
|
|
48
51
|
# preventing the success log message.
|
|
49
52
|
ready="false"
|
|
50
|
-
# Reset the SECONDS variable
|
|
51
|
-
SECONDS=60
|
|
52
53
|
|
|
53
54
|
while [[ $ready == "false" ]]; do
|
|
54
55
|
echo "Time ellapsed: $SECONDS seconds"
|
|
@@ -56,8 +57,8 @@ runs:
|
|
|
56
57
|
# Get input for max number of seconds to wait
|
|
57
58
|
# ${{ inputs.MAX_SECONDS_FOR_DOCKER }} as a number? Bash doesn't have types, just strings
|
|
58
59
|
# Check if max seconds till loading has passed
|
|
59
|
-
if [[ $SECONDS -ge
|
|
60
|
-
echo "Error: Timed out waiting for docker container to serve the site."
|
|
60
|
+
if [[ $SECONDS -ge $MAX_SECONDS_FOR_DOCKER ]]; then
|
|
61
|
+
echo "ALKiln GitHub Server Error: Timed out waiting for docker container to serve the site. If you want to give your docker container more timem to install, set the MAX_SECONDS_FOR_DOCKER input for this action."
|
|
61
62
|
break
|
|
62
63
|
fi
|
|
63
64
|
|
|
@@ -13,7 +13,7 @@ let get_base_interview_url = async function () {
|
|
|
13
13
|
let server_url = session_vars.get_da_server_url();
|
|
14
14
|
console.log(session_vars.get_install_type());
|
|
15
15
|
if (session_vars.get_install_type() === "server") {
|
|
16
|
-
let x = `${ server_url }/interview?new_session=1&i
|
|
16
|
+
let x = `${ server_url }/interview?new_session=1&i=docassemble.${session_vars.get_package_name().replace("-", ".")}%3Adata/questions/`;
|
|
17
17
|
// e.g. http://localhost/interview?new_session=1&i=ALKiln%3A
|
|
18
18
|
console.log(`base_interview_url: ${x}`)
|
|
19
19
|
return x;
|
package/package.json
CHANGED