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.

Sign up for GitHub

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

Fix CLI tgz bundle #96

Merged
merged 2 commits into from
Feb 6, 2024
Merged

Fix CLI tgz bundle #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7820aeb
update workflow
zFernand0 Feb 6, 2024
556b430
update buildtgz
zFernand0 Feb 6, 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
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:

- name: Update Dependencies
id: npm-update
uses: zowe-actions/octorelease/script@reg-config
uses: zowe-actions/octorelease/script@v1
with:
config-dir: .github
script: npmUpdate
Expand All @@ -79,6 +79,7 @@ jobs:
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'
Expand Down Expand Up @@ -113,7 +114,7 @@ jobs:
run: npm ci

- name: Update Dependencies
uses: zowe-actions/octorelease/script@reg-config
uses: zowe-actions/octorelease/script@v1
env:
GIT_COMMITTER_NAME: zowe_robot
GIT_COMMITTER_EMAIL: [email protected]
Expand All @@ -125,7 +126,7 @@ jobs:
- name: Build Source
run: npm run build

- uses: zowe-actions/octorelease@reg-config
- uses: zowe-actions/octorelease@v1
env:
GIT_COMMITTER_NAME: ${{ secrets.ZOWE_ROBOT_USER }}
GIT_COMMITTER_EMAIL: ${{ secrets.ZOWE_ROBOT_EMAIL }}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zowe/cics_monorepo",
"private": true,
"version": "4.0.8",
"version": "4.0.9",
"publishConfig": {
"registry": "https://zowe.jfrog.io/zowe/api/npm/npm-local-release/"
},
Expand Down
8 changes: 6 additions & 2 deletions scripts/bundleTgz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,12 @@ fsE.copyFileSync(pkgJsonFile, pkgJsonFile + ".bak");
try {
// Install node_modules directly inside packages/cli
execCmd("npm run preshrinkwrap");
const sdkTgzPath = path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + tempPkgJson.version + ".tgz");
execCmd(`${npmInstallCmd} ${sdkTgzPath}`);
try {
execCmd(`npm view @zowe/cics-for-zowe-sdk`);
} catch (err) {
const sdkTgzPath = path.relative(__dirname, "../dist/zowe-cics-for-zowe-sdk-" + tempPkgJson.version + ".tgz");
execCmd(`${npmInstallCmd} ${sdkTgzPath}`);
}
execCmd(npmInstallCmd);
for (const zowePkgDir of fsE.readdirSync(path.join(cliPkgDir, "node_modules", "@zowe"))) {
const srcDir = path.join("node_modules", "@zowe", zowePkgDir);
Expand Down
Loading