Skip to content

Commit

Permalink
Use zowe-v3-lts tag and remove profiles directory
Browse files Browse the repository at this point in the history
Signed-off-by: Timothy Johnson <[email protected]>
  • Loading branch information
t1m0thyj committed Sep 24, 2024
1 parent 1ea84a5 commit d3a6798
Show file tree
Hide file tree
Showing 113 changed files with 25 additions and 172,129 deletions.
24 changes: 11 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,22 @@ jobs:
if: ${{ github.event.inputs.zowe-version && github.event.inputs.zowe-version != '' }}
run: |
curl -s https://raw.githubusercontent.com/zowe/zowe-cli-standalone-package/${{ github.event.inputs.zowe-version }}/master/zowe-versions.yaml > __zowe__version__
npm install -g @zowe/cli@$(yq '.packages.cli."zowe-v2-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/cics-for-zowe-cli@$(yq '.packages."cics-for-zowe-cli"."zowe-v2-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/db2-for-zowe-cli@$(yq '.packages."db2-for-zowe-cli"."zowe-v2-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/ims-for-zowe-cli@$(yq '.packages."ims-for-zowe-cli"."zowe-v2-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/mq-for-zowe-cli@$(yq '.packages."mq-for-zowe-cli"."zowe-v2-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/zos-ftp-for-zowe-cli@$(yq '.packages."zos-ftp-for-zowe-cli"."zowe-v2-lts"' __zowe__version__ | tr -d '"')
npm install -g @zowe/cli@$(yq '.packages.cli."zowe-v3-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/cics-for-zowe-cli@$(yq '.packages."cics-for-zowe-cli"."zowe-v3-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/db2-for-zowe-cli@$(yq '.packages."db2-for-zowe-cli"."zowe-v3-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/mq-for-zowe-cli@$(yq '.packages."mq-for-zowe-cli"."zowe-v3-lts"' __zowe__version__ | tr -d '"')
zowe plugins install @zowe/zos-ftp-for-zowe-cli@$(yq '.packages."zos-ftp-for-zowe-cli"."zowe-v3-lts"' __zowe__version__ | tr -d '"')
rm __zowe__version__
- name: Set Up Zowe
id: setup-zowe
if: ${{ steps.get-version-from-workflow.outcome == 'skipped' }}
run: |
npm install -g @zowe/cli@zowe-v2-lts
zowe plugins install @zowe/cics-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/db2-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/ims-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/mq-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/zos-ftp-for-zowe-cli@zowe-v2-lts
npm install -g @zowe/cli@zowe-v3-lts
zowe plugins install @zowe/cics-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/db2-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/mq-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/zos-ftp-for-zowe-cli@zowe-v3-lts
- name: Get Zowe version
id: get-version
Expand All @@ -86,7 +84,7 @@ jobs:
zowe --version || true
npm run build:local -- ${{ github.event.inputs.zowe-version || steps.get-version.outputs.number }}
export margin="0.4in"
puppeteer print ./generatedWebHelp/docs/all.html ./zowe.pdf --margin-top $margin --margin-right $margin --margin-bottom $margin --margin-left $margin --no-sandbox
puppeteer print ./generatedWebHelp/docs/all.html ./zowe.pdf --margin-top $margin --margin-right $margin --margin-bottom $margin --margin-left $margin --no-sandbox
- name: Archive Results
id: upload
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,18 @@ jobs:

- name: Install Node Package Dependencies
id: install-node
run: |
run: |
npm i --prod
npm install -g puppeteer-cli
- name: Set Up Zowe
id: setup-zowe
run: |
npm install -g @zowe/cli@zowe-v2-lts
zowe plugins install @zowe/cics-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/db2-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/ims-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/mq-for-zowe-cli@zowe-v2-lts
zowe plugins install @zowe/zos-ftp-for-zowe-cli@zowe-v2-lts
npm install -g @zowe/cli@zowe-v3-lts
zowe plugins install @zowe/cics-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/db2-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/mq-for-zowe-cli@zowe-v3-lts
zowe plugins install @zowe/zos-ftp-for-zowe-cli@zowe-v3-lts
- name: Get Zowe version
id: get-version
Expand All @@ -50,9 +49,8 @@ jobs:
id: setup
run: |
jq '.commandGroups=["cics","db2","ims","mq","zos-ftp"]' zowe.template.json > zowe.json
echo "$(jq '.profiles=["cics", "db2","ims","mq","zftp"]' zowe.json)" > zowe.json
npm run contribute
- name: Teardown Zowe Plugins
id: teardown-zowe
run: |
Expand All @@ -69,7 +67,7 @@ jobs:
zowe --version || true
npm run build:local -- ${{ steps.get-version.outputs.number }}
export margin="0.4in"
puppeteer print ./generatedWebHelp/docs/all.html ./zowe.pdf --margin-top $margin --margin-right $margin --margin-bottom $margin --margin-left $margin --no-sandbox
puppeteer print ./generatedWebHelp/docs/all.html ./zowe.pdf --margin-top $margin --margin-right $margin --margin-bottom $margin --margin-left $margin --no-sandbox
- name: Archive Results
id: upload
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ jobs:
readarray -t all_files <<<"$(jq -r '.[]' <<<'${{ steps.files.outputs.all_changed_files }}')"
for file in ${all_files[@]}; do
[[ ''${file}'' == *.jsonc ]] || (echo "Not a JSON file: ${file}" && exit 1)
[[ ''${file}'' == commandGroups/* ]] || [[ ''${file}'' == profiles/* ]] || (echo "Wrong location: ${file}" && exit 1)
[[ ''${file}'' == commandGroups/* ]] || (echo "Wrong location: ${file}" && exit 1)
done
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,13 @@ To add your conformant plug-in's commands, perform the following steps:
If it is not already installed, see Step 3 in the [Installing](#installing) section.
2. Define command groups and profiles that your plug-in contributes.
2. Define command groups that your plug-in contributes.
- Copy the template file `zowe.template.json` to a new file named `zowe.json`. This file will be ignored by git.
- Customize this file to include the full names of command group(s) of your plug-in(s), and the name(s) of your plug-in's profile(s), like the following:
- Customize this file to include the full names of command group(s) of your plug-in(s), like the following:
```json
{
"commandGroups": ["zowe-cli-sample"],
"profiles": ["sample"]
"commandGroups": ["zowe-cli-sample"]
}
```
> **Note:** No @zowe scoped plug-ins should be included in this repository, and the above is merely for demonstration purposes.
Expand All @@ -63,7 +62,7 @@ To add your conformant plug-in's commands, perform the following steps:
```bash
npm run contribute
```
This will retrieve the CLI command tree from Zowe CLI and all installed plug-ins, and extract the above command group(s) and profile(s) to `.jsonc` files in the "commandGroups" and "profiles" directories.
This will retrieve the CLI command tree from Zowe CLI and all installed plug-ins, and extract the above command group(s) to `.jsonc` files in the "commandGroups" directory.

5. Commit new files back to the GitHub repository.

Expand Down
Loading

0 comments on commit d3a6798

Please sign in to comment.