Skip to content

Commit

Permalink
Merge pull request #385 from zowe/v2.x/staging
Browse files Browse the repository at this point in the history
merge staging into rc
  • Loading branch information
1000TurquoisePogs authored Jul 12, 2023
2 parents b8fde04 + 9ed701f commit 18bbf13
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-configmgr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ jobs:
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/bump-zis-version@v2.x/main
with:
version: 'PATCH'
version: 'MINOR'
env:
GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Zowe Common C Changelog

## `2.10.0`

- Feature: The configmgr can now use the 'zos' module in YAML config templates. The 'zos' module is only added when run on ZOS. For a list of available functions, see https://github.com/zowe/zowe-install-packaging/blob/v2.x/staging/build/zwe/types/%40qjstypes/zos.d.ts (#384)
- Bugfix: configmgr parsing of yaml to json was limited to 256 characters for strings. This has been updated to 1024 to allow for up to max unix path strings. (#383)

## `2.9.0`

- Feature: configmgr's zos module now has a "resolveSymbol" function which takes a string starting with & which can be used to resolve static and dynamic zos symbols
Expand Down
2 changes: 1 addition & 1 deletion build/configmgr.proj.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT="configmgr"
VERSION=2.9.0
VERSION=2.10.0
DEPS="QUICKJS LIBYAML"

QUICKJS="quickjs"
Expand Down
2 changes: 1 addition & 1 deletion c/embeddedjs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ JSModuleDef *ejsModuleLoader(JSContext *ctx,
if (endsWith(nativeName,".js") ||
endsWith(nativeName,".mjs")){
/* printf("module filename already has extension '%s'\n",nativeName); */
memcpy(nameToLoad, moduleName, modNameLen);
memcpy(nameToLoad, moduleName, modNameLen);
} else {
memcpy(nameToLoad, moduleName, modNameLen);
memcpy(nameToLoad + modNameLen, asciiDotJS, sizeof(asciiDotJS));
Expand Down
2 changes: 1 addition & 1 deletion c/yaml2json.c
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ static int emitScalar(yaml_emitter_t *emitter, char *scalar, char *tag, int styl

static int writeJsonAsYaml1(yaml_emitter_t *emitter, Json *json){
yaml_event_t event;
char scalarBuffer[256];
char scalarBuffer[MAX_ACCESS_PATH];
if (jsonIsArray(json)){
JsonArray *array = jsonAsArray(json);
int elementCount = jsonArrayGetCount(array);
Expand Down
2 changes: 1 addition & 1 deletion manifest.template.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: zowe-common-c

version: 2.9.0
version: 2.10.0

homepage: https://zowe.org
keywords:
Expand Down

0 comments on commit 18bbf13

Please sign in to comment.