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

Publish v2 #88

Merged
merged 10 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions .github/release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
level: "minor",
devDependencies: {
"@zowe/imperative": "zowe-v2-lts",
"@zowe/zowe-explorer-api": "zowe-v2-lts",
"@zowe/zowe-explorer-api": ["zowe-v2-lts", "@zowe:registry=https://registry.npmjs.org/"],
}
},
{
Expand All @@ -15,7 +15,7 @@ module.exports = {
level: "patch",
devDependencies: {
"@zowe/imperative": "zowe-v1-lts",
"@zowe/zowe-explorer-api": "zowe-v1-lts",
"@zowe/zowe-explorer-api": ["zowe-v1-lts", "@zowe:registry=https://registry.npmjs.org/"],
}
},
{
Expand All @@ -25,7 +25,7 @@ module.exports = {
prerelease: true,
devDependencies: {
"@zowe/imperative": "next",
"@zowe/zowe-explorer-api": "next",
"@zowe/zowe-explorer-api": ["next", "@zowe:registry=https://registry.npmjs.org/"],
}
}
],
Expand All @@ -44,10 +44,12 @@ module.exports = {
[
"@octorelease/lerna",
{
pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"],
// The shrinkwrap pruning should happen after only as part of the prepack of the CLI Plug-in
// pruneShrinkwrap: ["@zowe/cics-for-zowe-cli"],

// Use Lerna only for versioning and publish packages independently
npmPublish: false,
versionIndependent: ["cics-extension-for-zowe"]
versionIndependent: ["cics-extension-for-zowe"],
},
],
[
Expand All @@ -57,24 +59,22 @@ module.exports = {
aliasTags: {
"latest": ["zowe-v2-lts"],
},
npmPublish: false,
tarballDir: "dist",
npmPublish: true,
},
{
$cwd: "packages/cli",
aliasTags: {
"latest": ["zowe-v2-lts"],
},
npmPublish: false,
tarballDir: "dist",
npmPublish: true,
},
],
[
"@octorelease/vsce",
{
$cwd: "packages/vsce",
ovsxPublish: false,
vscePublish: false,
ovsxPublish: true,
vscePublish: true,
vsixDir: "dist",
},
],
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Process Label Action
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Process Label Action
uses: hramos/respond-to-issue-based-on-label@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

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

Expand Down
34 changes: 16 additions & 18 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
paths:
- .github/**
- packages/**
- .npmrc
- package.json
pull_request:
paths:
- packages/**
Expand Down Expand Up @@ -36,10 +38,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -48,14 +50,6 @@ 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

Expand All @@ -76,23 +70,24 @@ jobs:

- name: Archive Results
if: ${{ always() && steps.build.outcome == 'success' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-${{ matrix.node-version }}-results
path: packages/*/__tests__/__results__/

- name: Upload Results to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
env_vars: OS,NODE
token: ${{ secrets.CODECOV_TOKEN }}

# - name: Bundle all packages
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '18.x'
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.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
# if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
# uses: actions/upload-artifact@v4
# with:
# name: zowe-cics-client
# path: dist/*
Expand All @@ -104,14 +99,14 @@ jobs:

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

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

Expand All @@ -131,7 +126,7 @@ jobs:
- name: Build Source
run: npm run build

- uses: zowe-actions/octorelease@fix/allow-first-time-publish2
- uses: zowe-actions/octorelease@v1
env:
GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }}
GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
Expand All @@ -140,5 +135,8 @@ jobs:
NPM_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
NPM_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
NPM_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
NPM_TOKEN: ${{ secrets.VSCODE_NPM_PUBLISHER_TOKEN }}
OVSX_PAT: ${{ secrets.VSCODE_OVSX_PUBLISHER_TOKEN }}
VSCE_PAT: ${{ secrets.VSCODE_VSCE_PUBLISHER_TOKEN }}
with:
config-dir: .github
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
- uses: actions/stale@v9
with:
# General rules applied to both, issues and pull requests (PRs)
days-before-close: 14
Expand Down
12 changes: 0 additions & 12 deletions lerna.json

This file was deleted.

3 changes: 2 additions & 1 deletion package-lock.json

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

14 changes: 9 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"name": "@zowe/cics_monorepo",
"private": true,
"version": "5.0.3",
"publishConfig": {
"registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
},
"repository": "https://github.com/zowe/cics-for-zowe-client",
"workspaces": [
"./packages/*"
],
"scripts": {
"build": "turbo build",
"watch": "turbo watch",
Expand All @@ -13,10 +21,6 @@
"prepare": "husky install",
"license": "node scripts/updateLicenses.js"
},
"repository": "https://github.com/zowe/cics-for-zowe-client",
"workspaces": [
"./packages/*"
],
"devDependencies": {
"@types/glob": "^7.2.0",
"@types/jest": "^29.5.0",
Expand Down Expand Up @@ -62,4 +66,4 @@
"typescript": "^5.0.3",
"uuid": "^9.0.0"
}
}
}
Loading
Loading