Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port changes from tested fork #13

Merged
merged 57 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
732dd17
test001
zFernand0 Aug 9, 2023
214b06a
test001
zFernand0 Aug 9, 2023
9f3460d
add release portion :yum:
zFernand0 Aug 9, 2023
319c574
test001
zFernand0 Aug 9, 2023
72fe643
test
zFernand0 Aug 9, 2023
0fa51e6
Merge pull request #1 from zFernand0/test
zFernand0 Aug 9, 2023
c1c3cb1
trying to start actions
zFernand0 Aug 9, 2023
b02b382
Merge pull request #2 from zFernand0/test
zFernand0 Aug 9, 2023
74e2f35
add npmUpdate
zFernand0 Aug 9, 2023
d4be422
add config-dir
zFernand0 Aug 9, 2023
4f55b57
add empty dependencies obj
zFernand0 Aug 9, 2023
efc0154
add syncpack
zFernand0 Aug 9, 2023
293362e
back to package-lock, add preshrinkwrap and pruneSW on release.config
zFernand0 Aug 11, 2023
305adec
simplify test-tsconfig.json
zFernand0 Aug 11, 2023
5fa48c2
the error seems to indicate that I may need the cli as a dependency?
zFernand0 Aug 11, 2023
8f2ba3d
install the cli as a dev dep on vsce just because ze-api has it as a dep
zFernand0 Aug 11, 2023
0c021dd
add config-dir for release.config.js
zFernand0 Aug 11, 2023
b8d06a5
test independent vsce versioning
zFernand0 Aug 11, 2023
52abc80
Merge pull request #3 from zFernand0/test
zFernand0 Aug 11, 2023
eaa78ca
try without version on package.json
zFernand0 Aug 11, 2023
165523a
Merge pull request #4 from zFernand0/test
zFernand0 Aug 11, 2023
344ed78
[temp] make test go faster
zFernand0 Aug 11, 2023
334e0da
add workflow dispatch to the release
zFernand0 Aug 11, 2023
ba7dfb8
Merge pull request #5 from zFernand0/test
zFernand0 Aug 11, 2023
b5b65f0
remove force publish (for fixed mode)
zFernand0 Aug 11, 2023
2387e47
Merge pull request #6 from zFernand0/test
zFernand0 Aug 11, 2023
c4341f3
update vsce version to 5
zFernand0 Aug 11, 2023
657f4d9
Merge pull request #7 from zFernand0/test
zFernand0 Aug 11, 2023
e20a20d
go full independent
zFernand0 Aug 11, 2023
a56a041
Merge pull request #8 from zFernand0/test
zFernand0 Aug 11, 2023
9ed76ed
skip first release
zFernand0 Aug 11, 2023
c05bbbd
Merge pull request #9 from zFernand0/test
zFernand0 Aug 11, 2023
de710d5
install lerna 6
zFernand0 Aug 11, 2023
efd9d72
Merge pull request #10 from zFernand0/test
zFernand0 Aug 11, 2023
a87c9cd
test002
zFernand0 Aug 11, 2023
c947e39
no need to PRs for now
zFernand0 Aug 11, 2023
0badf8c
make test a release branch
zFernand0 Aug 11, 2023
a10b73e
add npm-lockfile
zFernand0 Aug 14, 2023
a5d46c3
update lerna.json
zFernand0 Aug 14, 2023
524ff4b
avoid errors if package doesn't exist
zFernand0 Aug 14, 2023
21135bd
update rewrite sw
zFernand0 Aug 14, 2023
237e09f
hack the SW generation process
zFernand0 Aug 14, 2023
1a2c25a
update zowe-explorer-api
zFernand0 Aug 14, 2023
d83d3d2
fix rewrite sw
zFernand0 Aug 14, 2023
ba16917
rename root to cli plugin name
zFernand0 Aug 15, 2023
b76ff4b
Bump version to 5.0.2 [ci skip]
zowe-robot Aug 15, 2023
ef154ec
npm pack now creates an offline tgz
zFernand0 Feb 1, 2024
c04c36d
postpone lint issues
zFernand0 Feb 1, 2024
198a855
cannot bundle if the sdk is not published yet
zFernand0 Feb 1, 2024
acb10a9
revert testing-related temporary changes :yum:
zFernand0 Feb 1, 2024
ba0885b
Merge branch 'main' into test
zFernand0 Feb 1, 2024
4ee44e0
addressed all known configuration problems
zFernand0 Feb 1, 2024
5b7b475
update package-lock
zFernand0 Feb 1, 2024
f8cbd56
update packing script
zFernand0 Feb 1, 2024
28a2c60
attempt to include optional dependencies since package-lock contains …
zFernand0 Feb 1, 2024
3be1377
try installing each dependency
zFernand0 Feb 1, 2024
befb595
add every turbo optional dependency resolution
zFernand0 Feb 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@ overrides:
rules:
no-magic-numbers: off
# There are several errors falling under these rules; resolve
"@typescript-eslint/require-await": warn
"@typescript-eslint/require-await": off
"@typescript-eslint/no-misused-promises": warn
"@typescript-eslint/no-unsafe-return": warn
"@typescript-eslint/restrict-plus-operands": warn
"@typescript-eslint/restrict-template-expressions": warn
"@typescript-eslint/explicit-function-return-type": warn
"@typescript-eslint/restrict-plus-operands": off
"@typescript-eslint/restrict-template-expressions": off
"@typescript-eslint/explicit-function-return-type": off
"@typescript-eslint/unbound-method": warn
parser: "@typescript-eslint/parser"
parserOptions:
ecmaVersion: 6
sourceType: module
project:
- "./tsconfig.json"
- "./tsconfig-tests.json"
- "./__tests__/test-tsconfig.json"
plugins:
- "@typescript-eslint"
rules:
"@typescript-eslint/await-thenable": off
"@typescript-eslint/consistent-type-assertions": warn
"@typescript-eslint/restrict-plus-operands": warn
"@typescript-eslint/restrict-plus-operands": off
"@typescript-eslint/explicit-member-accessibility": warn
"@typescript-eslint/explicit-function-return-type": warn
"@typescript-eslint/restrict-template-expressions": warn
"@typescript-eslint/explicit-function-return-type": off
"@typescript-eslint/restrict-template-expressions": off
indent": off
"@typescript-eslint/indent":
- error
Expand All @@ -50,7 +50,7 @@ rules:

"@typescript-eslint/no-shadow": error
"@typescript-eslint/no-unused-expressions": error
"@typescript-eslint/no-var-requires": warn
"@typescript-eslint/no-var-requires": off
array-callback-return: error
complexity:
- warn
Expand Down
76 changes: 66 additions & 10 deletions .github/release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ module.exports = {
branches: [
{
name: "main",
channel: "latest",
level: "minor",
devDependencies: {
"@zowe/imperative": "zowe-v2-lts",
Expand All @@ -10,24 +11,79 @@ module.exports = {
},
{
name: "zowe-v1-lts",
channel: "zowe-v1-lts",
level: "patch",
devDependencies: {
"@zowe/imperative": "zowe-v1-lts",
"@zowe/zowe-explorer-api": "zowe-v1-lts",
}
},
{
name: "next",
channel: "next",
level: "major",
prerelease: true,
devDependencies: {
"@zowe/imperative": "next",
"@zowe/zowe-explorer-api": "next",
}
}
],
plugins: [
"@octorelease/changelog",
["@octorelease/npm", {
aliasTags: {
latest: ["zowe-v2-lts"]
[
"@octorelease/changelog",
{
displayNames: {
"cli": "IBM CICS Plug-in for Zowe CLI",
"sdk": "IBM CICS for Zowe SDK",
"vsce": "IBM CICS Extension for Zowe Explorer",
},
headerLine: "## Recent Changes",
},
],
[
"@octorelease/lerna",
{
pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"],
// Use Lerna only for versioning and publish packages independently
npmPublish: false,
},
],
[
"@octorelease/npm",
{
$cwd: "packages/sdk",
aliasTags: {
"latest": ["zowe-v2-lts"],
},
npmPublish: false,
tarballDir: "dist",
},
{
$cwd: "packages/cli",
aliasTags: {
"latest": ["zowe-v2-lts"],
},
npmPublish: false,
tarballDir: "dist",
},
],
[
"@octorelease/vsce",
{
$cwd: "packages/vsce",
ovsxPublish: false,
vscePublish: false,
vsixDir: "dist",
},
],
[
"@octorelease/github",
{
assets: ["dist/*.tgz", "dist/*.vsix"],
draftRelease: true,
},
pruneShrinkwrap: false
}],
["@octorelease/github", {
checkPrLabels: true
}],
"@octorelease/git"
],
"@octorelease/git",
]
};
80 changes: 71 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Zowe CICS Main CI
on:
push:
paths:
- .github/**
- packages/**
pull_request:
paths:
Expand All @@ -19,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [16.x, 18.x]
node-version: [16.x, 18.x, 20.x]
os: [windows-latest, ubuntu-latest, macos-latest]

env:
Expand Down Expand Up @@ -47,9 +48,24 @@ jobs:
echo "::remove-matcher owner=eslint-compact::"
echo "::remove-matcher owner=eslint-stylish::"

# - name: Install turbo based on the OS
# run: |
# os_name="${{ matrix.os }}"
# os_name="${os_name/windows-latest/windows}"
# os_name="${os_name/ubuntu-latest/linux}"
# os_name="${os_name/macos-latest/darwin}"
# npm i "turbo-${os_name}-64"

- name: Install Dependencies
run: npm ci

- name: Update Dependencies
id: npm-update
uses: zowe-actions/octorelease/script@v1
with:
config-dir: .github
script: npmUpdate

- name: Build Source
id: build
run: npm run build
Expand All @@ -70,13 +86,59 @@ jobs:
with:
env_vars: OS,NODE

- name: Bundle all packages
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
run: npm i -g vsce && npm run package
# - name: Bundle all packages
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
# run: npm i -g vsce && npm run package

- name: Archive all packages
if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
uses: actions/upload-artifact@v3
# - name: Archive all packages
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
# uses: actions/upload-artifact@v3
# with:
# name: zowe-cics-client
# path: dist/*

release:
if: github.event_name == 'push' && github.ref_protected
needs: test
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
ref: ${{ github.ref }}

- name: Use Node.js LTS
uses: actions/setup-node@v3
with:
node-version: lts/*

- name: Install Dependencies
run: npm ci

- name: Update Dependencies
uses: zowe-actions/octorelease/script@v1
env:
GIT_COMMITTER_NAME: zowe_robot
GIT_COMMITTER_EMAIL: [email protected]
NPM_RESOLUTIONS: ${{ needs.test.outputs.npm-resolutions }}
with:
config-dir: .github
script: npmUpdate

- name: Build Source
run: npm run build

- uses: zowe-actions/octorelease@v1
env:
GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }}
GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
GIT_CREDENTIALS: x-access-token:${{ secrets.ZOWE_ROBOT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
NPM_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
NPM_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
with:
name: zowe-cics-client
path: dist/*
config-dir: .github
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
npm-shrinkwrap.json
packages/cli/npm-shrinkwrap.json
coverage/
node_modules/
npm-debug.log
Expand Down
10 changes: 6 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
{
"version": "5.0.1-SNAPSHOT",
"version": "5.0.2",
"command": {
"version": {
"forcePublish": true,
"private": true
"publish": {
"ignoreChanges": [
"packages/vsce/**"
],
"registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
}
},
"useWorkspaces": true
Expand Down
Loading
Loading