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

Next zowex is zowe #1114

Merged
merged 37 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f3ea2b5
Add sysinfo package.
gejohnston Aug 12, 2021
9027a85
Add sysinfo package.
gejohnston Aug 12, 2021
ceec646
When we cannot connect to daemon, check if daemon is running.
gejohnston Aug 12, 2021
8042e39
Add module pathsearch.
gejohnston Aug 12, 2021
c5a2a18
Add get_nodejs_zowe_path.
gejohnston Aug 12, 2021
fe1f51b
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Aug 16, 2021
def78fb
Add start_daemon function.
gejohnston Aug 16, 2021
8b25e59
Make executable name zowe. Update version.
gejohnston Aug 19, 2021
dd6ac32
Remove duplicated host.
gejohnston Aug 19, 2021
bd5411e
Alter how the daemon is launched for Linux.
gejohnston Aug 23, 2021
a0dfed3
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Aug 23, 2021
f63159c
Run Win command with no color (no escape chars).
gejohnston Aug 23, 2021
3a5fc76
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Aug 30, 2021
f1ce2af
Merge remote-tracking branch 'origin/next-make-it-build' into next-zo…
gejohnston Aug 30, 2021
1cb8a88
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Aug 30, 2021
be51377
Run deamon or classic zowe based on env variable.
gejohnston Sep 1, 2021
4be7461
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Sep 2, 2021
fed3c97
Alter how we launch classic zowe on Linux.
gejohnston Sep 2, 2021
47748a2
Turn off color when starting daemon on Windows.
gejohnston Sep 3, 2021
68cc2c6
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Sep 15, 2021
ad4cf03
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Sep 20, 2021
762051e
Add daemon-mode changelog entries.
gejohnston Sep 24, 2021
4c2c2cd
Add quotes to args with spaces in cmd sent to daemon.
gejohnston Sep 24, 2021
0be6e17
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Oct 21, 2021
e2e45d2
Fix typo in change log.
gejohnston Oct 21, 2021
f810866
Use daemon mode by default. Env var turns it off
gejohnston Nov 1, 2021
560131c
Update check_changelog_action to v1.
gejohnston Nov 1, 2021
b85201c
Publish under the name zowe instead of zowex.
gejohnston Nov 1, 2021
d76312c
Document ZOWE_USE_DAEMON with "no" instead of yes
gejohnston Nov 1, 2021
4e46abd
Add artifacts to each Rust CI build
zFernand0 Nov 2, 2021
dbef8dc
Merge pull request #1191 from zowe/next-zowex-artifacts
zFernand0 Nov 4, 2021
6f67894
Bundle prebuilt daemon binaries in CLI package
t1m0thyj Nov 4, 2021
039da7c
Use double equals as compare symbol in Bash
t1m0thyj Nov 4, 2021
e92398d
Merge pull request #1194 from zowe/next-bundle-daemon
t1m0thyj Nov 5, 2021
3e288b0
Add 0 to list of values that can turn off daemon.
gejohnston Nov 8, 2021
ac5af39
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Nov 9, 2021
705c1bf
Merge remote-tracking branch 'origin/next' into next-zowex-is-zowe
gejohnston Nov 11, 2021
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 .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Create Archive
run: |
cd target/release
tar -cvzf zowex.tgz zowex
tar -cvzf zowe.tgz zowe

- name: Upload Release Asset
id: upload-release-asset
Expand All @@ -96,8 +96,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
asset_path: target/release/zowex.tgz
asset_name: zowex-linux.tgz
asset_path: target/release/zowe.tgz
asset_name: zowe-linux.tgz
asset_content_type: application/octet-stream


Expand Down Expand Up @@ -126,7 +126,7 @@ jobs:
- name: Create Archive
run: |
cd target/release
tar -cvzf zowex.tgz zowex
tar -cvzf zowe.tgz zowe

- name: Upload Release Asset
id: upload-release-asset
Expand All @@ -135,8 +135,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
asset_path: target/release/zowex.tgz
asset_name: zowex-macos.tgz
asset_path: target/release/zowe.tgz
asset_name: zowe-macos.tgz
asset_content_type: application/octet-stream


Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
- name: Create Archive
run: |
cd target/release
tar -cvzf zowex.tgz zowex.exe
tar -cvzf zowe.tgz zowe.exe

- name: Upload Release Asset
id: upload-release-asset
Expand All @@ -174,6 +174,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.get_upload_url.outputs.upload_url }}
asset_path: target\release\zowex.tgz
asset_name: zowex-windows.tgz
asset_path: target\release\zowe.tgz
asset_name: zowe-windows.tgz
asset_content_type: application/octet-stream
84 changes: 78 additions & 6 deletions .github/workflows/rust-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,94 @@ name: Rust CLI CI
on:
push:
branches-ignore:
- "master"
- "next"
paths: "zowex/**"
- "master"
- "next"
paths:
- "zowex/**"
- '.github/workflows/rust-cli*.yml'
pull_request:
paths: "zowex/**"

jobs:
build:

build-linux:
name: Build Linux
runs-on: ubuntu-latest

# Need to build in container with old version of GLIBC to support RHEL 7
# https://kobzol.github.io/rust/ci/2021/05/07/building-rust-binaries-in-ci-that-work-with-older-glibc.html
container: quay.io/pypa/manylinux2014_x86_64
steps:
- uses: actions/checkout@v2

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true

- name: Build
run: cargo build --verbose --manifest-path=zowex/Cargo.toml

- name: Create Archive
run: |
cd zowex/target/debug
tar -cvzf zowe.tgz zowe

- name: Archive Results
id: upload
uses: actions/upload-artifact@v2
with:
name: zowe-linux.tgz
path: zowex/target/debug/zowe.tgz

- name: Run tests
run: cargo test --verbose --manifest-path=zowex/Cargo.toml

build-macos:
name: Build MacOS
runs-on: macos-latest
steps:
- uses: actions/checkout@v2

- name: Build
run: cargo build --verbose --manifest-path=zowex/Cargo.toml

- name: Create Archive
run: |
cd zowex/target/debug
tar -cvzf zowe.tgz zowe

- name: Archive Results
id: upload
uses: actions/upload-artifact@v2
with:
name: zowe-macos.tgz
path: zowex/target/debug/zowe.tgz

- name: Run tests
run: cargo test --verbose --manifest-path=zowex/Cargo.toml

build-windows:
name: Build Windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v2

- name: Build
run: cargo build --verbose --manifest-path=zowex/Cargo.toml

- name: Create Archive
run: |
cd zowex/target/debug
tar -cvzf zowe.tgz zowe.exe

- name: Archive Results
id: upload
uses: actions/upload-artifact@v2
with:
name: zowe-windows.tgz
path: zowex/target/debug/zowe.tgz

- name: Run tests
run: cargo test --verbose --manifest-path=zowex/Cargo.toml
run: cargo test --verbose --manifest-path=zowex/Cargo.toml
14 changes: 14 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,20 @@ node('zowe-jenkins-agent-dind') {
header: "## Recent Changes"
)

pipeline.createStage(
name: "Bundle Daemon Binaries",
shouldExecute: {
return pipeline.protectedBranches.isProtected(BRANCH_NAME)
},
timeout: [time: 10, unit: 'MINUTES'],
stage: {
def daemonVer = readProperties(file: "zowex/Cargo.toml").version
withCredentials([usernamePassword(credentialsId: 'zowe-robot-github', usernameVariable: 'USERNAME', passwordVariable: 'TOKEN')]) {
sh "bash jenkins/bundleDaemon.sh ${daemonVer} \"${USERNAME}:${TOKEN}\""
}
}
)

pipeline.createStage(
name: "Bundle Keytar Binaries",
shouldExecute: {
Expand Down
23 changes: 23 additions & 0 deletions jenkins/bundleDaemon.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
# Usage: bash bundleDaemon.sh <daemonVersion> [githubAuthHeader]
set -ex

daemonVersion=$1
githubAuthHeader=$2

until [[ $(curl -fs https://[email protected]/repos/zowe/zowe-cli/releases/tags/native-v$daemonVersion |
jq -r '.assets | length') == "3" ]]; do
echo "Waiting for Rust CLI Publish workflow to complete..."
sleep 30
done

cd "$(git rev-parse --show-toplevel)"
rm -rf prebuilds
mkdir prebuilds && cd prebuilds

for platform in linux macos windows; do
curl -fsLOJ https://github.com/zowe/zowe-cli/releases/download/native-v$daemonVersion/zowe-$platform.tgz
done

cd ..
mv prebuilds packages/cli/
Loading