Compare commits

...

13 Commits

Author SHA1 Message Date
Jess Bees
eaf36f48c9 Merge pull request #24 from actions/decouple-telemetry
Decouple telemetry API call from main action
2022-03-31 12:34:24 -04:00
Jess Bees
01f6ae5af2 Recompile action after pulling in PR suggestions 2022-03-31 12:05:36 -04:00
Jess Bees
82cb77089c Update action.yml
Co-authored-by: James M. Greene <JamesMGreene@github.com>
2022-03-31 11:47:49 -04:00
Jess Bees
ad36b7023a Don't bother converting action input to string
This has been an established pattern with Actions for a long time; we don't have to worry about it changing.

Co-authored-by: James M. Greene <JamesMGreene@github.com>
2022-03-31 11:47:33 -04:00
Jess Bees
32b8b86ff0 Support existing behavior of this action 2022-03-29 15:08:35 -04:00
Jess Bees
a598b2af14 Correctly test for boolean input's truthiness
It gets cast to a string! Eep!
2022-03-29 09:45:18 -04:00
Jess Bees
f511fa4665 Merge branch 'main' into decouple-telemetry 2022-03-29 09:05:35 -04:00
Yoann Chaudet
0e157789db Merge pull request #27 from actions/increase-default-query-interval
Increase default query interval and fix time exceed bug
2022-03-28 12:38:22 -07:00
yimysty
12940a5b99 fix the timeout not honor bug 2022-03-28 12:32:59 -07:00
yimysty
6afc4f2884 slow query seconds 2022-03-28 12:28:46 -07:00
Jess Bees
7a1dc4e394 update dist files 2022-03-23 14:56:28 -04:00
Jess Bees
92f6725bee Only emit telemetry when the emit_telemetry input is truthy 2022-03-23 14:40:57 -04:00
Jess Bees
e1279a88ef Don't call the telemetry pre-hook entrypoint 2022-03-23 14:22:16 -04:00
7 changed files with 45 additions and 24 deletions

View File

@@ -3,8 +3,10 @@ description: 'A GitHub Action to deploy an artifact to GitHub Pages'
runs: runs:
using: 'node16' using: 'node16'
main: 'dist/index.js' main: 'dist/index.js'
pre: 'pre/index.js'
inputs: inputs:
emit_telemetry:
description: 'Should this action only emit build telemetry instead of deploying the build artifact?'
required: false
token: token:
description: 'GitHub token' description: 'GitHub token'
default: ${{ github.token }} default: ${{ github.token }}
@@ -20,7 +22,7 @@ inputs:
reporting_interval: reporting_interval:
description: 'Time in milliseconds between two deployment status report (default: 1 second)' description: 'Time in milliseconds between two deployment status report (default: 1 second)'
required: false required: false
default: "1000" default: "5000"
outputs: outputs:
page_url: page_url:
description: 'URL to deployed Github Pages' description: 'URL to deployed Github Pages'

13
dist/index.js vendored
View File

@@ -7182,13 +7182,14 @@ class Deployment {
core.setFailed('Failed with status code: ' + res.status) core.setFailed('Failed with status code: ' + res.status)
break break
} }
}
// Handle timeout // Handle timeout
if (Date.now() - startTime >= timeout) { if (Date.now() - startTime >= timeout) {
core.info('Timeout reached, aborting!') core.info('Timeout reached, aborting!')
core.setFailed('Timeout reached, aborting!') core.setFailed('Timeout reached, aborting!')
return return
} }
}
} catch (error) { } catch (error) {
core.setFailed(error) core.setFailed(error)
if (error.response && error.response.data) { if (error.response && error.response.data) {
@@ -7472,7 +7473,15 @@ process.on('SIGINT', cancelHandler)
process.on('SIGTERM', cancelHandler) process.on('SIGTERM', cancelHandler)
// Main // Main
main().then(() => __nccwpck_require__(9557)) const emitTelemetry = core.getInput("emit_telemetry")
if (emitTelemetry === "true") {
__nccwpck_require__(9557)
} else if (emitTelemetry === "false") {
main()
} else {
// If emit_telemetry is not set, that indicates an older version of the dynamic workflow that doesn't separate telemetry from deployment
main().then(() => __nccwpck_require__(9557))
}
})(); })();

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View File

@@ -7182,13 +7182,14 @@ class Deployment {
core.setFailed('Failed with status code: ' + res.status) core.setFailed('Failed with status code: ' + res.status)
break break
} }
}
// Handle timeout // Handle timeout
if (Date.now() - startTime >= timeout) { if (Date.now() - startTime >= timeout) {
core.info('Timeout reached, aborting!') core.info('Timeout reached, aborting!')
core.setFailed('Timeout reached, aborting!') core.setFailed('Timeout reached, aborting!')
return return
} }
}
} catch (error) { } catch (error) {
core.setFailed(error) core.setFailed(error)
if (error.response && error.response.data) { if (error.response && error.response.data) {

File diff suppressed because one or more lines are too long

View File

@@ -138,13 +138,14 @@ class Deployment {
core.setFailed('Failed with status code: ' + res.status) core.setFailed('Failed with status code: ' + res.status)
break break
} }
}
// Handle timeout // Handle timeout
if (Date.now() - startTime >= timeout) { if (Date.now() - startTime >= timeout) {
core.info('Timeout reached, aborting!') core.info('Timeout reached, aborting!')
core.setFailed('Timeout reached, aborting!') core.setFailed('Timeout reached, aborting!')
return return
} }
}
} catch (error) { } catch (error) {
core.setFailed(error) core.setFailed(error)
if (error.response && error.response.data) { if (error.response && error.response.data) {

View File

@@ -52,4 +52,12 @@ process.on('SIGINT', cancelHandler)
process.on('SIGTERM', cancelHandler) process.on('SIGTERM', cancelHandler)
// Main // Main
main().then(() => require('./pre')) const emitTelemetry = core.getInput("emit_telemetry")
if (emitTelemetry === "true") {
require('./pre')
} else if (emitTelemetry === "false") {
main()
} else {
// If emit_telemetry is not set, that indicates an older version of the dynamic workflow that doesn't separate telemetry from deployment
main().then(() => require('./pre'))
}