Skip to content

Commit

Permalink
Merge pull request #128 from zowe/v2.x/staging
Browse files Browse the repository at this point in the history
merge v2 staging into v3
  • Loading branch information
1000TurquoisePogs authored Sep 17, 2024
2 parents 7a336a0 + 6389a4c commit 5db9e25
Show file tree
Hide file tree
Showing 7 changed files with 326 additions and 63 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
push:
branches:
- v2.x/master
- v2.x/staging
- v2.x/rc
pull_request:
types: [opened, reopened, synchronize]
workflow_dispatch:
Expand Down Expand Up @@ -183,7 +185,7 @@ jobs:
uses: zowe-actions/shared-actions/release@main

- name: '[Release 2] NPM bump version (if necessary)'
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' && env.IS_RELEASE_BRANCH == 'true' && env.IS_FORMAL_RELEASE_BRANCH == 'true' && env.PRE_RELEASE_STRING == ''}}
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' && env.IS_RELEASE_BRANCH == 'true' }}
uses: zowe-actions/shared-actions/bump-version@main
with:
version: minor
Expand Down
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
# Zowe Launcher Changelog

All notable changes to the Zowe Launcher package will be documented in this file..
All notable changes to the Zowe Launcher package will be documented in this file.
This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.

## 2.17.0
- Using configmgr to create the component list rather than zwe. (#117)

## 2.13.0
- Bugfix: Changed timestamp to UTC to match the server timestamps (#103)
- Bugfix: Removed server timestamps from syslog to avoid duplicate logging of time (#103)
- Bugfix: Avoided hang on components when components were logging messages longer than 1024 characters. (#103)
- Enhancement: syslog output per line is capped at 512 bytes, extra characters will be omitted (#103)
- Enhancement: Added milliseconds logging to match the server timestamps (#103)
- Enhancement: Launcher prints a message at the beginning of startup to alert users whether or not their log output has long enough lines to be readable if sent to support. (#101)
- Added a wrapper for wtoPrintf3

## 2.12.0
- Added a wrapper for wtoPrintf3
- Bugfix: Fixed a gap in WTO syslog checking
- Bugfix: Fixed a gap in WTO syslog checking
2 changes: 1 addition & 1 deletion build/launcher.proj.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PROJECT="launcher"
VERSION=2.12.0
VERSION=2.14.0
DEPS="QUICKJS LIBYAML COMMON"

QUICKJS="quickjs"
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: launcher
# Component identifier. This identifier matches artifact path in Zowe Artifactory https://zowe.jfrog.io/.
id: org.zowe.launcher
# Component version
version: 2.13.0
version: 2.19.0
# Human readable component name
title: Zowe Launcher
# Human readable component description
Expand Down
15 changes: 8 additions & 7 deletions samplib/ZWESLSTC
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//ZWESLSTC PROC RGN=0M,HAINST='{{ha_instance_id}}'
//ZWESLSTC PROC RGN=0M,HAINST='__ha_instance_id__'
//********************************************************************/
//* This program and the accompanying materials are */
//* made available under the terms of the */
Expand All @@ -22,10 +22,11 @@
//********************************************************************/
//ZWELNCH EXEC PGM=ZWELNCH,REGION=&RGN,TIME=NOLIMIT,
// PARM='ENVAR(_CEE_ENVFILE=DD:STDENV),POSIX(ON)/&HAINST.'
//STEPLIB DD DSNAME=&SYSUID..LOADLIB,DISP=SHR
//SYSIN DD DUMMY
//SYSPRINT DD SYSOUT=*,LRECL=1600
//SYSERR DD SYSOUT=*
//STEPLIB DD DSNAME={zowe.setup.dataset.authLoadlib},
// DISP=SHR
//SYSIN DD DUMMY
//SYSPRINT DD SYSOUT=*,LRECL=1600
//SYSERR DD SYSOUT=*
//********************************************************************/
//*
//* CONFIG= can be either a single path ex.
Expand Down Expand Up @@ -55,7 +56,7 @@
//********************************************************************/
//STDENV DD *
_CEE_ENVFILE_CONTINUATION=\
_CEE_RUNOPTS=HEAPPOOLS(OFF)
_CEE_RUNOPTS=HEAPPOOLS(OFF),HEAPPOOLS64(OFF)
_EDC_UMASK_DFLT=0002
CONFIG=#zowe_yaml
CONFIG={ZWE_CLI_PARAMETER_CONFIG}
/*
Loading

0 comments on commit 5db9e25

Please sign in to comment.