ENT-4664: Added sys.policy_release_id#5866
Conversation
a9a4132 to
55f1c49
Compare
55f1c49 to
d62f673
Compare
|
Could you add an acceptance test to check that this variable is defined? |
|
@cf-bottom Jenkins please :) |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/12571/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12571/ |
223d6df to
55cbf1b
Compare
This is unrelated to you PR, but you can fix it by doing what I did in this PR NorthernTechHQ/libntech#255 |
df278e3 to
d638c03
Compare
larsewi
left a comment
There was a problem hiding this comment.
The libntech should already updated on the master branch (see #5867). Try to fetch all and rebase with upstream master. In the third commit, please explain why you specified the deployment target in the commit message. Otherwise the commit message is not very useful.
Ticket: ENT-4664 Signed-off-by: Victor Moene <victor.moene@northern.tech>
Signed-off-by: Victor Moene <victor.moene@northern.tech>
The function 'strchrnul' has been marked as being introduced in macOS
15.4, although it seems to have been working for as long as we have been
testing on macOS. Since warnings are treated as errors, the build will
fail. Hence, the simplest way to silence the warning is, it to specify
the deployment target to be a minimum of macOS 15.4.
```
logging.c:651:28: error: 'strchrnul' is only available on macOS 15.4 or newer [-Werror,-Wunguarded-availability-new]
651 | char *next_token = strchrnul(token, ',');
CC queue.lo
| ^~~~~~~~~
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/_string.h:198:9: note: 'strchrnul' has been marked as being introduced in macOS 15.4 here, but the deployment target is macOS 15.0.0
198 | strchrnul(const char *__s, int __c);
CC rb-tree.lo
| ^
logging.c:651:28: note: enclose 'strchrnul' in a __builtin_available check to silence this warning
651 | char *next_token = strchrnul(token, ',');
| ^~~~~~~~~
1 error generated.
```
It has been done similarly here: NorthernTechHQ/libntech#255
Signed-off-by: Victor Moene <victor.moene@northern.tech>
4b0cb19 to
f1c9a91
Compare
|
@cf-bottom Jenkins please :) |
|
Alright, I triggered a build: Jenkins: https://ci.cfengine.com/job/pr-pipeline/12622/ Packages: http://buildcache.cfengine.com/packages/testing-pr/jenkins-pr-pipeline-12622/ |
|
@victormlg @larsewi this is the kind of thing we need to backport. I will back port it to 3.24.x here: #5780 to get that PR green. 👍 I will do it also for 3.21 separately as I am not back-porting my other change to 3.21. |
|
3.21 looks good after this is cherry-picked... #5892 |
No description provided.