Skip to content

Commit

Permalink
Merge pull request #102 from zowe/users/jstruga/upgrade-versions
Browse files Browse the repository at this point in the history
Sync all versions
  • Loading branch information
timgerstel authored Feb 13, 2023
2 parents 28f078a + bfd2ddf commit e28adf1
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 13 deletions.
19 changes: 13 additions & 6 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,35 +54,36 @@ jobs:
- name: '[Prep 3] Setup Node'
uses: actions/setup-node@v2
with:
node-version: 10.24.1
node-version: 16.15.0

- name: '[Prep 4] Setup jFrog CLI'
uses: jfrog/setup-jfrog-cli@v2
env:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}

- name: '[Prep 5] prepare workflow'
- name: '[Prep 5] Prepare Workflow'
uses: zowe-actions/zlux-builds/plugins/[email protected]/main
with:
github-user: ${{ secrets.ZOWE_ROBOT_USER }}
github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }}
github-email: ${{ secrets.ZOWE_ROBOT_EMAIL }}
github-branch: ${{ github.event.inputs.BRANCH_NAME }}
release: ${{ github.event.inputs.PERFORM_RELEASE }}
plugin-version: ${{ github.event.inputs.BUILD_VERSION }}

- name: '[Prep 6] build'
- name: '[Prep 6] Build'
uses: zowe-actions/zlux-builds/plugins/[email protected]/main
with:
build-zss: true

- name: '[Prep 7] packaging'
- name: '[Prep 7] Packaging'
uses: zowe-actions/zlux-builds/plugins/[email protected]/main
with:
pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }}
pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }}
pax-name: sample-angular-app

- name: '[Prep 8] deploy '
- name: '[Prep 8] Deploy '
uses: zowe-actions/zlux-builds/plugins/[email protected]/main

- name: '[Prep 9] NodeJS project setup'
Expand All @@ -100,4 +101,10 @@ jobs:

- name: '[Prep 10] Publish NPM Package '
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/plugins/[email protected]/main
uses: zowe-actions/zlux-builds/plugins/[email protected]/main

- name: '[Prep 11] Bump Staging Version '
if: ${{ github.event.inputs.PERFORM_RELEASE == 'true' && env.RELEASE == 'true' }}
uses: zowe-actions/zlux-builds/plugins/[email protected]/main
env:
GITHUB_TOKEN: ${{ secrets.ZOWE_ROBOT_TOKEN }}
2 changes: 1 addition & 1 deletion build/component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-sample",
"version": "2.6.0",
"version": "2.7.0",
"description": "Sample App Showcasing Angular Adapter",
"main": "angular-sample.pax",
"homepgae": "https://zowe.org",
Expand Down
2 changes: 1 addition & 1 deletion manifest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: angular-sample
id: org.zowe.zlux.sample.angular
# Without the v
version: 2.6.0
version: 2.7.0
# Human readable component name
title: Angular Sample
# Human readable component description
Expand Down
5 changes: 3 additions & 2 deletions nodeServer/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "org.zowe.zlux.sample.angular.nodeserver",
"version": "1.1.0",
"version": "2.7.0",
"description": "Hello World message",
"scripts": {
"build": "tsc",
"start": "tsc --watch"
"start": "tsc --watch",
"test": "exit 0"
},
"dependencies": {},
"devDependencies": {
Expand Down
65 changes: 65 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pluginDefinition.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"identifier": "org.zowe.zlux.sample.angular",
"apiVersion": "2.0.0",
"pluginVersion": "2.0.1",
"pluginVersion": "2.7.0",
"pluginType": "application",
"license": "EPL-2.0",
"author": "Zowe",
Expand Down
5 changes: 3 additions & 2 deletions webClient/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "org.zowe.zlux.sample.angular.webclient",
"version": "2.0.0",
"version": "2.7.0",
"scripts": {
"start": "webpack --progress --colors --watch",
"build": "webpack --progress --colors",
"i18n": "ng-xi18n -p tsconfig.i18n.json --i18nFormat=xlf --outFile=messages.xlf && xliffmerge -p xliffmerge.json",
"lint": "tslint -c tslint.json \"./**/*.ts\""
"lint": "tslint -c tslint.json \"./**/*.ts\"",
"test": "exit 0"
},
"private": true,
"devDependencies": {
Expand Down

0 comments on commit e28adf1

Please sign in to comment.