Enhancement: added defaults shell and working-directory to composite #1803

nikola-jokic · 2022-04-04T09:58:38Z

Closes #836

This also removes the required shell parameter. That would not break existing workflows but will execute using default behaviour if shell and defaults are not specified.

src/Runner.Worker/action_yaml.json

thboop · 2022-04-06T15:46:42Z

src/Runner.Worker/Handlers/CompositeActionHandler.cs

                ExecutionContext.StepTelemetry.HasRunsStep = hasRunsStep;
                ExecutionContext.StepTelemetry.HasUsesStep = hasUsesStep;
                ExecutionContext.StepTelemetry.StepCount = steps.Count;
            }
            ExecutionContext.StepTelemetry.Type = "composite";

+            // save job defaults run to be restored after the composite run
+            IDictionary<string, string> jobDefaultsRun = new Dictionary<string, string>();
+            if (ExecutionContext.Global.JobDefaults.ContainsKey("run"))


Lets not overwrite job defaults, let's use a new key called CompositeDefaults, to minimize risk of these changes and make it clearer to read the code where these values are coming from.

I changed it but I am not sure if this is what you have meant.

…tion yaml

thboop · 2022-04-28T01:46:26Z

src/Runner.Worker/action_yaml.json

@@ -133,7 +137,7 @@
                    "working-directory": "string-steps-context",
                    "shell": {
                        "type": "string-steps-context",
-                        "required": true
+                        "required": false


we should still fail here if composite defaults aren't set and a shell isn't set for that step. Do we currently do that?

Yes, in that case, the action would fail with this output:

roryabraham · 2022-06-30T22:35:51Z

Would love to see this PR make it over the finish line 😄

actions#2052) Co-authored-by: Octavia Stancu <[email protected]>

…tions#2069) * Include step context name in telemetry. * .

…ions#2062) * escaping key and quoting it to avoid key based command injection * extracted creation of flags to DockerUtil, with testing included

* Update releaseNote.md * Update runnerversion

) * adding retry-all-errors based on curl version >= 7.71.0 * adding logging * fixing conditional logic

…actions#2547) * Rename AcquireJobRequest::StreamID to AcquireJobRequest::JobMessageID to match corresponding server-side update. * appeased the linter * Added unit tests to prove AcquireJobRequest serialization/deserialization is as-expected. * Distinguish unit test variations. * Incorporated PR Feedback.

* Only upload to Results with new job message type * No need to have separate websocketFeedServer * Linting fix * Update src/Runner.Common/JobServerQueue.cs Co-authored-by: Tingluo Huang <[email protected]> * add connection timeout * Consolidate initializing webclient to result client * Retry websocket delivery for console logs * Linter fix * Do not give up for good, reconnect again in 10 minutes * Has to reset delivered * Only first time retry 3 times to connect to websocket --------- Co-authored-by: Tingluo Huang <[email protected]>

* Add orchestrationId to useragent for better correlation. * .

* handle conflict errors from run service * nit: formatting * fix formatting

* send annotations to run-service * skip message deletion * actually don't skip deletion * enum as numbers * fix enum * linting * remove unncessary file * feedback

Co-authored-by: Tingluo Huang <[email protected]>

…log. (actions#2591)

…ctions#2311) * [1742] Ensure multiple composite annoations are correctly written. This implementation uses a collector pattern to allow embedded ExecutionContexts to stash Issue objects for later processing by a non-embedded ancestor ExecutionContext. Also: - Provide explicit constructor implementations for ExecutionContext - Leverage explicit constructors to solidify immutability of several ExecutionContext class members. - Fixed erroneous call to ExecutionContext.Complete in CompositeActionHandler.cs - Use a consistent timestamp for FinishTime in ExecutionContext::Complete * Ensure collected issues are processed only by a non-embedded ExecutionContext. This was already implicit. Now, just making it explicit. * Provide a clear mechanism that allows callers to opt-in/opt-out of ExecutionContext::AddIssue's logging behavior. * Addressed deserialization inconsistencies in TimelineRecord.cs * Added TimelineRecord unit tests. * Refined unit tests related to TimelineRecord::Variables case-insensitivity * Add a unit test that verifies ExecutionContextLogOptions::LogMessageOverride has the desired effect. * Responded to PR feedback. * Don't allow embedded ExecutionContexts to add Issues to a TimelineRecord

…#2443) * Add --no-default-labels option Signed-off-by: Gabriel Adrian Samfira <[email protected]> * Add tests Signed-off-by: Gabriel Adrian Samfira <[email protected]> * . --------- Signed-off-by: Gabriel Adrian Samfira <[email protected]> Co-authored-by: Tingluo Huang <[email protected]>

…tructure Error Flagging (actions#2488) * adding extra catch for download failure in composite actions * Adding infra error * Adding error handling centralizing * updating try catch bubbling * cleaning up commits * cleaning up commits * cleaning up commits * updating bubbler * cleaning up test files * Fixing linting errors * updating exception bubble * reverting composite * updating catch to not exclude other exceptions * removing uneeded import * Update src/Runner.Worker/ActionRunner.cs Co-authored-by: Tingluo Huang <[email protected]> * Update src/Runner.Worker/ActionManager.cs Co-authored-by: Tingluo Huang <[email protected]> * Update src/Runner.Worker/ActionManager.cs Co-authored-by: Tingluo Huang <[email protected]> * Update src/Runner.Worker/ActionManager.cs Co-authored-by: Tingluo Huang <[email protected]> * Update src/Runner.Worker/ActionManager.cs Co-authored-by: Tingluo Huang <[email protected]> * moving download out of for loop; reverting exception wrap * Update src/Runner.Worker/ActionManager.cs Co-authored-by: Tingluo Huang <[email protected]> * Adding blank lines back * Adding blank lines back * removing uneeded catch for download fail * adding var back for consistency * formatting clean --------- Co-authored-by: Tingluo Huang <[email protected]>

src/Runner.Common/Logging.cs

            }

            string line = $"{DateTime.UtcNow.ToString("O")} {message}";
            _pageWriter.WriteLine(line);
+            _resultsBlockWriter.WriteLine(line);


src/Runner.Worker/ActionManifestManager.cs

Nikola Jokic added 2 commits April 4, 2022 11:50

added defaults shell and working-directory to composite

f572663

removed extra spaces in action_yaml

af1d9c0

nikola-jokic requested a review from a team as a code owner April 4, 2022 09:58

nikola-jokic changed the title ~~Enhancecment: added defaults shell and working-directory to composite~~ Enhancement: added defaults shell and working-directory to composite Apr 4, 2022

thboop reviewed Apr 6, 2022

View reviewed changes

src/Runner.Worker/action_yaml.json Outdated Show resolved Hide resolved

thboop reviewed Apr 6, 2022

View reviewed changes

src/Runner.Worker/action_yaml.json Outdated Show resolved Hide resolved

thboop reviewed Apr 6, 2022

View reviewed changes

src/Runner.Worker/action_yaml.json Show resolved Hide resolved

thboop reviewed Apr 6, 2022

View reviewed changes

merged from main, CompositeDefaults don't override global, renamed ac…

9fadfdc

…tion yaml

Im2451soon approved these changes Apr 7, 2022

View reviewed changes

Im2451soon previously approved these changes Apr 7, 2022

View reviewed changes

nikola-jokic requested a review from thboop April 7, 2022 12:59

Merge branch 'main' into nikola-jokic/enhancement/836

fc85544

nikola-jokic dismissed Im2451soon’s stale review via fc85544 April 11, 2022 12:57

ChristopherHX mentioned this pull request Apr 15, 2022

fix: remove composite restrictions nektos/act#1128

Merged

thboop reviewed Apr 28, 2022

View reviewed changes

Imtiyaz40 mentioned this pull request Apr 28, 2022

Json audio Imtiyaz40/github-slideshow#3

Open

nikola-jokic and others added 4 commits April 28, 2022 11:18

Merge branch 'actions:main' into nikola-jokic/enhancement/836

372229d

added check if default is set or shell is set

e87a311

added missing check on shell only if action source type is script

238565a

Merge branch 'actions:main' into nikola-jokic/enhancement/836

af94f51

roryabraham mentioned this pull request Jun 30, 2022

[No QA] Create composite action to set up git for OSBotify Expensify/App#9619

Merged

1 task

nikola-jokic and others added 7 commits August 16, 2022 05:39

Merge branch 'actions:main' into nikola-jokic/enhancement/836

b8e91ed

Improved error logs for missing 'using' configuration in metadata file (

a795990

actions#2052) Co-authored-by: Octavia Stancu <[email protected]>

Display full job name and nested workflow details in log (actions#2049)

703a54f

Include step context name and start/finish time in step telemetry (ac…

5731c0e

…tions#2069) * Include step context name in telemetry. * .

Escaping key and quoting it to avoid key based command injection (act…

a2fb048

…ions#2062) * escaping key and quoting it to avoid key based command injection * extracted creation of flags to DockerUtil, with testing included

Release notes for 2.296.0 (actions#2078)

2363d32

* Update releaseNote.md * Update runnerversion

Validate lines and columns for Annotations (actions#2082)

a47f49c

TingluoHuang and others added 17 commits May 12, 2023 13:05

Limit the time we wait for waiting websocket to connect. (actions#2554)

d28dd80

Adding curl --retry-all-errors for external tool downloads (actions#2557

601990b

) * adding retry-all-errors based on curl version >= 7.71.0 * adding logging * fixing conditional logic

Add *.ghe.localhost domains to hosted server check (actions#2536)

a3cc9e2

Add orchestrationId to useragent for better correlation. (actions#2568)

c283204

* Add orchestrationId to useragent for better correlation. * .

Prepare 2.304.0 runner release. (actions#2569)

4c3438c

handle conflict errors from run service (actions#2570)

737927e

* handle conflict errors from run service * nit: formatting * fix formatting

contribute.md: Fix link to style guidelines (actions#2560)

70d90a0

Fix null guard bug (actions#2576)

0db9b07

send annotations to run-service (actions#2574)

7b629c8

* send annotations to run-service * skip message deletion * actually don't skip deletion * enum as numbers * fix enum * linting * remove unncessary file * feedback

Remove Temporary Serialization Shim (actions#2549)

195f070

Resolve Actions Directly From Launch for Run Service Jobs (actions#2529)

e32d771

Co-authored-by: Tingluo Huang <[email protected]>

Trace WebSocket exception into verbose level to reduce noise in diag …

a92deb2

…log. (actions#2591)

nikola-jokic dismissed a stale review via 29b7a63 May 12, 2023 11:34

Bentley617617 previously approved these changes May 12, 2023

View reviewed changes

github-advanced-security bot found potential problems May 12, 2023

View reviewed changes

Nikola Jokic and others added 2 commits May 12, 2023 15:21

added defaults shell and working-directory to composite

822237f

Merge branch 'main' into nikola-jokic/enhancement/836

ab0f3e1

nikola-jokic force-pushed the nikola-jokic/enhancement/836 branch from 29b7a63 to ab0f3e1 Compare May 12, 2023 13:22

auto update leftover removed

274b805

nikola-jokic dismissed Bentley617617’s stale review via 274b805 May 12, 2023 13:23

encode every changed file to utf8

19f867d

AvaStancu reviewed May 17, 2023

View reviewed changes

src/Runner.Worker/ActionManifestManager.cs Show resolved Hide resolved

Add null reference guard

e4b8e89

haochenx mentioned this pull request Jul 23, 2023

Composite: Step Outputs are not available when in nested composite actions #2009

Open

Merge branch 'main' into nikola-jokic/enhancement/836

b997f1f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhancement: added defaults shell and working-directory to composite #1803

Enhancement: added defaults shell and working-directory to composite #1803

nikola-jokic commented Apr 4, 2022

thboop Apr 6, 2022

nikola-jokic Apr 7, 2022

thboop Apr 28, 2022

nikola-jokic Aug 16, 2022

roryabraham commented Jun 30, 2022

Enhancement: added defaults shell and working-directory to composite #1803

Are you sure you want to change the base?

Enhancement: added defaults shell and working-directory to composite #1803

Conversation

nikola-jokic commented Apr 4, 2022

thboop Apr 6, 2022

Choose a reason for hiding this comment

nikola-jokic Apr 7, 2022

Choose a reason for hiding this comment

thboop Apr 28, 2022

Choose a reason for hiding this comment

nikola-jokic Aug 16, 2022

Choose a reason for hiding this comment

roryabraham commented Jun 30, 2022