Merge branch 'v2.x/staging' into feature/paxUpload

zowe · Sep 20, 2023 · f330983 · f330983
2 parents aa4fc4e + 08d39d6
commit f330983
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 4 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -2,7 +2,8 @@ name: Build zen
 on:
   push:
     branches:
-      - main
+      - v2.x/main
+      - v2.x/staging
 
   pull_request:
     types: [opened, reopened, synchronize]
@@ -35,7 +36,7 @@ jobs:
         run: |
           npm run make  
       - name: '[prep 6] Publish'
-        uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish
+        uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
         with: 
           os: ubuntu
 
@@ -60,7 +61,7 @@ jobs:
         run: |
           npm run make  
       - name: '[prep 6] Publish'
-        uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish
+        uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
         with: 
           os: windows
 
@@ -84,6 +85,6 @@ jobs:
         run: |
           npm run make  
       - name: '[prep 6] Publish'
-        uses: zowe-actions/zlux-builds/zen/publish@users/jstruga/add-zen-publish
+        uses: zowe-actions/zlux-builds/zen/publish@v2.x/main
         with: 
           os: macos
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,51 @@
+name: Release zen draft
+on:
+  workflow_run:
+    workflows: ["Build zen"]
+    branches: [v2.x/main]
+    types:
+      - completed
+  workflow_dispatch:
+    inputs:
+      BUMP_TYPE:
+        description: 'When version bumping, set patch, minor, or major. Need this xor RELEASE_TAG.'
+        required: false
+      RELEASE_TAG:
+        description: 'Disable bumping by specifying a semver pattern (without v). Need this xor BUMP_TYPE'
+        required: false
+      RUN_ID:
+        description: 'Specify run id of asset to associate with release.'
+        required: true
+
+permissions:
+  contents: write
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: '[Setup] default env'
+        if: ${{ inputs.BUMP_TYPE == '' && inputs.RELEASE_TAG == '' }}
+        run: |
+          echo "BUMP_TYPE=minor" >> $GITHUB_ENV
+      - name: '[Setup] input env'
+        if: ${{ inputs.BUMP_TYPE }}
+        run: |
+          echo "BUMP_TYPE=${{ inputs.BUMP_TYPE }}" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: '[Create tag]'
+        id: tag_version
+        uses: mathieudutour/[email protected]
+        with:
+          github_token: ${{ github.token }}
+          default_bump: ${{ env.BUMP_TYPE }}
+          custom_tag: ${{ inputs.RELEASE_NUMBER }}
+      - name: '[Create release]'
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ steps.tag_version.outputs.new_tag }}
+          name: Release ${{ steps.tag_version.outputs.new_tag }}
+          draft: true
+          prerelease: false
+          token: ${{ github.token }}