Skip to content

Commit 5cfe4aa

Browse files
authored
Merge branch 'master' into ib/pr-labels
2 parents 81c8c7a + 2e2ac2d commit 5cfe4aa

File tree

97 files changed

+342
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+342
-115
lines changed

CHANGELOG.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,38 @@
11
# Change log
22

3+
## [2.16.0] - 2024-09-05
4+
5+
### Added
6+
7+
- runtime-v2: option to update meta only on termination or
8+
suspend
9+
([#948](https://github.com/walmartlabs/concord/pull/948));
10+
- policy-engine: allow rewriting with multiple values in
11+
`dependencyRewrite` policies
12+
([#952](https://github.com/walmartlabs/concord/pull/952));
13+
- concord-server: allow non-standard runtimes
14+
([#954](https://github.com/walmartlabs/concord/pull/954));
15+
- oidc: support "from" when logging out
16+
([#958](https://github.com/walmartlabs/concord/pull/958)).
17+
18+
### Changed
19+
20+
- runtime-v1: update bpm library to fix saving variables
21+
before suspend
22+
([#955](https://github.com/walmartlabs/concord/pull/955));
23+
- concord-server: fix DB change set 1580200-a when
24+
`superuserAvailable` is set to `false`
25+
([#957](https://github.com/walmartlabs/concord/pull/957));
26+
- concord-server: skip pull\_request process start when
27+
useEventCommitId is enabled and event is from a different repo
28+
([#959](https://github.com/walmartlabs/concord/pull/959));
29+
- docker-images: update ansible galaxy community.docker version
30+
([#960](https://github.com/walmartlabs/concord/pull/960));
31+
- cli: fix duplicate step logs
32+
([#963](https://github.com/walmartlabs/concord/pull/963)).
33+
34+
35+
336
## [2.15.0] - 2024-08-07
437

538
### Added
@@ -2961,7 +2994,7 @@ called in an expression.
29612994

29622995

29632996

2964-
## [1.37.1] - 2010-01-06
2997+
## [1.37.1] - 2020-01-06
29652998

29662999
### Changed
29673000

agent-operator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

agent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

cli/src/main/java/com/walmartlabs/concord/cli/runner/FlowStepLogger.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
* Licensed under the Apache License, Version 2.0 (the "License");
1010
* you may not use this file except in compliance with the License.
1111
* You may obtain a copy of the License at
12-
*
12+
*
1313
* http://www.apache.org/licenses/LICENSE-2.0
14-
*
14+
*
1515
* Unless required by applicable law or agreed to in writing, software
1616
* distributed under the License is distributed on an "AS IS" BASIS,
1717
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,6 +23,7 @@
2323
import com.walmartlabs.concord.runtime.v2.model.*;
2424
import com.walmartlabs.concord.runtime.v2.runner.context.ContextFactory;
2525
import com.walmartlabs.concord.runtime.v2.runner.logging.SegmentedLogger;
26+
import com.walmartlabs.concord.runtime.v2.runner.vm.LogSegmentScopeCommand;
2627
import com.walmartlabs.concord.runtime.v2.runner.vm.StepCommand;
2728
import com.walmartlabs.concord.runtime.v2.sdk.Context;
2829
import com.walmartlabs.concord.svm.Runtime;
@@ -36,6 +37,10 @@ public Result beforeCommand(Runtime runtime, VM vm, State state, ThreadId thread
3637
return Result.CONTINUE;
3738
}
3839

40+
if (cmd instanceof LogSegmentScopeCommand) {
41+
return Result.CONTINUE;
42+
}
43+
3944
StepCommand<?> s = (StepCommand<?>) cmd;
4045

4146
Location loc = s.getStep().getLocation();

client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

client2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

console2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.walmartlabs.concord</groupId>
77
<artifactId>parent</artifactId>
8-
<version>2.15.1-SNAPSHOT</version>
8+
<version>2.16.1-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

dependency-manager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.walmartlabs.concord</groupId>
88
<artifactId>parent</artifactId>
9-
<version>2.15.1-SNAPSHOT</version>
9+
<version>2.16.1-SNAPSHOT</version>
1010
<relativePath>../pom.xml</relativePath>
1111
</parent>
1212

0 commit comments

Comments
 (0)