Skip to content

Commit

Permalink
Merge branch 'v2.x/staging' of https://github.com/zowe/zen into tests…
Browse files Browse the repository at this point in the history
…/stateManagement
  • Loading branch information
sagaryadavs committed Oct 23, 2024
2 parents c75dc59 + 1c2008f commit 66f86cc
Show file tree
Hide file tree
Showing 81 changed files with 10,458 additions and 7,684 deletions.
51 changes: 48 additions & 3 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ on:
BRANCH_NAME:
description: 'Specify branch name or PR (e.g. PR-41)'
required: false
PERFORM_RELEASE:
description: '[Release] perform release'
required: false
default: 'false'
type: boolean

jobs:

Expand All @@ -39,6 +44,7 @@ jobs:
uses: zowe-actions/zlux-builds/zen/[email protected]/main
with:
os: ubuntu
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}


build-window:
Expand All @@ -64,6 +70,7 @@ jobs:
uses: zowe-actions/zlux-builds/zen/[email protected]/main
with:
os: windows
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}

build-macos:
runs-on: macos-latest
Expand All @@ -78,15 +85,53 @@ jobs:
node-version: 18
- name: '[Prep 3] Checkout'
uses: actions/checkout@v3
- name: '[prep 4] Install'
- name: '[Prep 4] Install Python 3.12 for npm appdmg'
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: '[prep 5] Install'
run: |
python3 -m pip install setuptools
npm install
- name: '[prep 5] Package'
- name: '[prep 6] Package'
run: |
npm run make
- name: '[prep 6] Publish'
- name: '[prep 7] Publish'
uses: zowe-actions/zlux-builds/zen/[email protected]/main
with:
os: macos
perform-release: ${{ github.event.inputs.PERFORM_RELEASE }}


post-build:
runs-on: ubuntu-latest
needs:
- build-ubuntu
- build-window
- build-macos
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
steps:
- name: 'Checkout'
uses: actions/checkout@v3

- name: 'Set tag value'
run: |
COMMIT_HASH=$(git rev-parse --verify HEAD)
CURRENT_TIME=$(date +%s%3N)
if [ -z ${{ github.event.pull_request.number }} ]
then
CURRENT_BRANCH=${GITHUB_REF#refs/heads/}
else
CURRENT_BRANCH=PR-${{ github.event.pull_request.number }}
fi
P_VERSION=$(cat package.json | grep -o '"version": *"[^"]*"' | sed 's/"version": "\(.*\)"/\1/')
- name: '[Release 1] Release (if necessary)'
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
uses: zowe-actions/shared-actions/release@main

- name: '[Release 2] Bump Zen Version (if necessary)'
if: ${{ success() && github.event.inputs.PERFORM_RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/zen/[email protected]/main
env:
GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}
51 changes: 0 additions & 51 deletions .github/workflows/release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Developer.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ZEN - Zowe Enterprise Necessity
# ZEN - Zowe Server Install Wizard

### Introduction

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ZEN - Zowe Enterprise Necessity
# ZEN - Zowe Server Install Wizard

Zowe Enterprise Necessity is an Electron-based tool that provides a simpler UI to install and configure Zowe
Zowe Server Install Wizard is an Electron-based tool that provides a simpler UI to install and configure Zowe

The application is in the development stage and has limited functionality so far. It is able to connect to the mainframe using the [zos-node-accessor](https://github.com/IBM/zos-node-accessor) module, perform some basic environment validations, download the Zowe convenience build, and run `zwe install` command by submitting JES jobs. [Here](https://github.com/zowe/zen/issues/1) is a brief description with screenshots.

Expand All @@ -10,6 +10,8 @@ Node version 18.12 or higher is required.

### Developing

Note: `npm run start` may succeed without errors, but `npm run make` may not. It is always advised to run `npm run make` after writing new code, or using the build automation to view errors

Run `npm install` to install dependencies

Run `npm run start` to run the application locally
Expand Down
Loading

0 comments on commit 66f86cc

Please sign in to comment.