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

Merge master into next #2142

Merged
merged 52 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
4fc2680
Add API changes & tests
awharn Oct 5, 2023
73f31f8
Additional changes
awharn Oct 12, 2023
9aac6c5
Update tests
awharn Oct 12, 2023
afc4c8e
Merge remote-tracking branch 'origin/master' into fix-encodings-and-n…
awharn Oct 12, 2023
9fa3116
Create dco.yml
zFernand0 Apr 10, 2024
be499e0
Merge pull request #2117 from zowe/add-dco-yml
zFernand0 Apr 10, 2024
52949a7
Reinstate token precedence over password in AbstractRestClient.
gejohnston Apr 15, 2024
a38fabf
Replace credOrder parm to constructor with authTypeOrder in ISession
gejohnston Apr 16, 2024
252ebfa
Use ||= operator for credsAreSet
gejohnston Apr 17, 2024
69edc44
Fix tests to reflect changes in AbstractRestClient
gejohnston Apr 17, 2024
2fb0af4
Reflect changes in AbstractRestClient in tests
gejohnston Apr 18, 2024
9243721
Add new tests for new setXXXAuth( ) functions
gejohnston Apr 18, 2024
e33e0a8
Add instructions for adding PFX certs
gejohnston Apr 25, 2024
bb9b314
Add changelog entry
gejohnston Apr 30, 2024
8a9c0b3
Merge pull request #2119 from zowe/cred-order-v2
gejohnston Apr 30, 2024
0a961e2
Bump version to 7.24.1 [ci skip]
zowe-robot Apr 30, 2024
86d0bfd
Fix macOS tgz containing extra GNUSparseFile.0 directory
t1m0thyj May 1, 2024
e32363b
Try to fix daemon build on M1 runners
t1m0thyj May 1, 2024
18cf124
Fix pre-commit script to support Git worktrees
t1m0thyj May 2, 2024
17ba056
Update Cargo.lock for technical currency
t1m0thyj May 2, 2024
9ec5f9c
Update wording of changelog entry
t1m0thyj May 2, 2024
65d4aa9
Merge pull request #2127 from zowe/fix/git-hook-worktrees
t1m0thyj May 2, 2024
b2ed039
Merge branch 'master' into fix/macos-daemon-tgz
t1m0thyj May 2, 2024
113e5eb
Merge pull request #2126 from zowe/fix/macos-daemon-tgz
t1m0thyj May 3, 2024
59a4b1e
Bump version to 7.24.2 [ci skip]
zowe-robot May 3, 2024
11c8edc
Show strings instead of regexes for allowed values in CLI help
t1m0thyj May 9, 2024
d4ac11d
Fix secure properties not listed outside the active config layer
t1m0thyj May 9, 2024
a464932
Merge remote-tracking branch 'origin/master' into fix-encodings-and-n…
awharn May 9, 2024
9d32ad8
Make some changes
awharn May 9, 2024
c62e69c
Merge pull request #2133 from zowe/fix/command-help-regexes
t1m0thyj May 10, 2024
f40e041
Merge branch 'master' into fix/secure-props-for-profile
t1m0thyj May 10, 2024
11008bc
Merge pull request #2135 from zowe/fix/secure-props-for-profile
t1m0thyj May 10, 2024
e8518da
Bump version to 7.24.3 [ci skip]
zowe-robot May 10, 2024
1929463
Merge remote-tracking branch 'origin/master' into fix-encodings-and-n…
awharn May 13, 2024
a217664
Fix issue, fix conflicting integration tests, fix system tests
awharn May 13, 2024
6a1f0ca
Update changelogs
awharn May 13, 2024
4c75f96
Add encoding to Submit Jobs CLI and APIs
awharn May 13, 2024
4ed7108
Add tests
awharn May 14, 2024
6eb89a8
Oops, don't include my jest user config
awharn May 14, 2024
159c2d6
Fix local JCL
awharn May 14, 2024
b6d5d5f
Add changelogs
awharn May 14, 2024
22efd8b
Fix unit test
awharn May 14, 2024
36d1386
Update interface
awharn May 14, 2024
578e2a3
Update changelog
awharn May 14, 2024
7ac79a6
Make requested changes
awharn May 15, 2024
44839b2
Make requested changes
awharn May 15, 2024
137cc73
Merge pull request #1822 from zowe/fix-encodings-and-newlines
awharn May 15, 2024
7ee1b35
Merge remote-tracking branch 'origin/master' into add-submit-jobs-enc…
awharn May 15, 2024
eb92768
Merge pull request #2139 from zowe/add-submit-jobs-encoding
awharn May 15, 2024
d206684
Bump version to 7.25.0 [ci skip]
zowe-robot May 15, 2024
580ba8a
Merge remote-tracking branch 'origin/master' into merge-master-into-next
awharn May 15, 2024
b91ddbd
Fix tests
awharn May 15, 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
3 changes: 3 additions & 0 deletions .github/dco.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
allowRemediationCommits:
individual: true
thirdParty: true
5 changes: 3 additions & 2 deletions .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
targets: x86_64-apple-darwin

- uses: actions/download-artifact@v4
with:
Expand All @@ -106,10 +106,11 @@ jobs:
mv ../aarch64-apple-darwin/release/zowe zowe.aarch64 && mv ../x86_64-apple-darwin/release/zowe zowe.x86_64
lipo -create -output zowe zowe.aarch64 zowe.x86_64

# Use gtar instead of tar on MacOS to prevent extra `GNUSparseFile.0` directory
- name: Create Archive
run: |
cd target/release
tar -cvzf zowe.tgz zowe
gtar -cvzf zowe.tgz zowe
mv zowe.tgz zowe-macos.tgz

- name: Upload Release Asset
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rust-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
targets: aarch64-apple-darwin
targets: x86_64-apple-darwin

- name: Build
run: |
Expand All @@ -74,6 +74,7 @@ jobs:
mv ../aarch64-apple-darwin/debug/zowe zowe.aarch64 && mv ../x86_64-apple-darwin/debug/zowe zowe.x86_64
lipo -create -output zowe zowe.aarch64 zowe.x86_64

# Use gtar instead of tar on MacOS to prevent extra `GNUSparseFile.0` directory
- name: Create Archive
run: |
cd zowex/target/debug
Expand Down
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,4 @@ packages/imperative/web-help/dist/css/bundle*
packages/imperative/web-help/dist/js/

jest-stare/

jest.user.config.js
jest.user.config.js
Loading
Loading