Skip to content

Commit

Permalink
Merge branch 'v3.x/staging' of github.com:zowe/zlux-app-server into v…
Browse files Browse the repository at this point in the history
…2.x/staging
  • Loading branch information
DivergentEuropeans committed Mar 13, 2024
2 parents a6d4d1d + b277d9f commit e7db221
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/build-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build Core
on:
push:
branches:
- v2.x/staging
- v3.x/staging
pull_request:
types: [opened, reopened, synchronize]

Expand All @@ -28,9 +28,9 @@ on:
description: 'zlux-shared PR number'
required: false
DEFAULT_BRANCH:
description: 'please enter the default branch you would like to build with, default will be v2.x/staging'
description: 'please enter the default branch you would like to build with, default will be v3.x/staging'
required: false
default: 'v2.x/staging'
default: 'v3.x/staging'

jobs:
check-permission:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
JF_ARTIFACTORY_1: ${{ secrets.JF_ARTIFACTORY_TOKEN }}

- name: '[Prep 4] prepare workflow'
uses: zowe-actions/zlux-builds/core/prepare@v2.x/main
uses: zowe-actions/zlux-builds/core/prepare@v3.x/main
with:
github-user: ${{ secrets.ZOWE_ROBOT_USER }}
github-password: ${{ secrets.ZOWE_ROBOT_TOKEN }}
Expand All @@ -173,7 +173,7 @@ jobs:
default-base: ${{ github.event.inputs.DEFAULT_BRANCH }}

- name: '[Prep 5] build'
uses: zowe-actions/zlux-builds/core/build@v2.x/main
uses: zowe-actions/zlux-builds/core/build@v3.x/main
with:
zlux-app-manager: ${{ github.event.inputs.ZLUX_APP_MANAGER }}
zlux-app-server: ${{ github.event.inputs.ZLUX_APP_SERVER }}
Expand All @@ -183,12 +183,12 @@ jobs:
zlux-shared: ${{ github.event.inputs.ZLUX_SHARED }}

- name: '[Prep 6] packaging'
uses: zowe-actions/zlux-builds/core/package@v2.x/main
uses: zowe-actions/zlux-builds/core/package@v3.x/main
with:
pax-ssh-username: ${{ secrets.SSH_MARIST_USERNAME }}
pax-ssh-password: ${{ secrets.SSH_MARIST_RACF_PASSWORD }}
pax-name: zlux-core

- name: '[Prep 7] deploy'
uses: zowe-actions/zlux-builds/core/deploy@v2.x/main
uses: zowe-actions/zlux-builds/core/deploy@v3.x/main

0 comments on commit e7db221

Please sign in to comment.