Skip to content

Commit

Permalink
Merge branch 'master' into dev/add-package-script
Browse files Browse the repository at this point in the history
  • Loading branch information
t1m0thyj authored Feb 5, 2024
2 parents b5dee73 + bfac3d9 commit 957c244
Show file tree
Hide file tree
Showing 12 changed files with 52 additions and 78 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,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
8 changes: 4 additions & 4 deletions .github/workflows/auto-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ 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
uses: dessant/label-actions@v4
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: '.github/label-actions.yml'
github-token: ${{ secrets.GITHUB_TOKEN }}
config-path: '.github/label-actions.yml'
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,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 @@ -28,7 +28,7 @@ jobs:

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,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
56 changes: 14 additions & 42 deletions .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
ZOWEX_VERSION: ${{ steps.get-version.outputs.ZOWEX_VERSION }}

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

- name: Get version
id: get-version
Expand All @@ -28,19 +28,15 @@ jobs:

- name: Create Release
id: create_release
uses: ncipollo/release-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag: native-v${{ steps.get-version.outputs.ZOWEX_VERSION }}
name: Native Client Release ${{ steps.get-version.outputs.ZOWEX_VERSION }}
body: |
Native Zowe CLI client which communicates with a "daemon" version of Zowe CLI.
draft: false
prerelease: false
makeLatest: false

- uses: actions/upload-artifact@v3
run: |
gh release create \
-n "Native Zowe CLI client which communicates with a 'daemon' version of Zowe CLI." \
-t "Native Client Release ${{ steps.get-version.outputs.ZOWEX_VERSION }}" \
native-v${{ steps.get-version.outputs.ZOWEX_VERSION }}
- uses: actions/upload-artifact@v4
with:
name: repo
path: |
Expand All @@ -59,7 +55,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: repo

Expand All @@ -79,17 +75,9 @@ jobs:
- name: Upload Release Asset
id: upload-release-asset
uses: ncipollo/release-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }}
name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }}
allowUpdates: true
artifacts: target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz
artifactContentType: application/octet-stream
removeArtifacts: false
replacesArtifacts: false
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/x86_64-unknown-linux-gnu/release/zowe-linux.tgz


build-macos:
Expand All @@ -106,7 +94,7 @@ jobs:
with:
targets: aarch64-apple-darwin

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: repo

Expand All @@ -126,17 +114,9 @@ jobs:
- name: Upload Release Asset
id: upload-release-asset
uses: ncipollo/release-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }}
name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }}
allowUpdates: true
artifacts: target/release/zowe-macos.tgz
artifactContentType: application/octet-stream
removeArtifacts: false
replacesArtifacts: false
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-macos.tgz


build-windows:
Expand All @@ -151,7 +131,7 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: repo

Expand All @@ -168,14 +148,6 @@ jobs:
- name: Upload Release Asset
id: upload-release-asset
uses: ncipollo/release-action@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag: native-v${{ needs.release.outputs.ZOWEX_VERSION }}
name: Native Client Release ${{ needs.release.outputs.ZOWEX_VERSION }}
allowUpdates: true
artifacts: target/release/zowe-windows.tgz
artifactContentType: application/octet-stream
removeArtifacts: false
replacesArtifacts: false
run: gh release upload native-v${{ needs.release.outputs.ZOWEX_VERSION }} target/release/zowe-windows.tgz
12 changes: 6 additions & 6 deletions .github/workflows/rust-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

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

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Archive Results
id: upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zowe-linux.tgz
path: zowex/target/x86_64-unknown-linux-gnu/debug/zowe.tgz
Expand All @@ -59,7 +59,7 @@ jobs:
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

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

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Archive Results
id: upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zowe-macos.tgz
path: zowex/target/debug/zowe.tgz
Expand All @@ -95,7 +95,7 @@ jobs:
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

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

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
Expand All @@ -112,7 +112,7 @@ jobs:
- name: Archive Results
id: upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zowe-windows.tgz
path: zowex/target/debug/zowe.tgz
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/secrets-sdk-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
run:
working-directory: packages/secrets
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
check-latest: true
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/secrets-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ jobs:
name: stable - ${{ matrix.settings.target }} - node@20
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: ${{ !matrix.settings.docker }}
with:
node-version: 20
Expand All @@ -108,7 +108,7 @@ jobs:
toolchain: stable
target: ${{ matrix.settings.target }}
- name: Cache cargo
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/.cargo/registry/index/
Expand All @@ -127,7 +127,7 @@ jobs:
working-directory: "."
run: npm ci --ignore-scripts
- name: Setup node x86
uses: actions/setup-node@v3
uses: actions/setup-node@v4
if: matrix.settings.target == 'i686-pc-windows-msvc'
with:
node-version: 20
Expand All @@ -146,7 +146,7 @@ jobs:
if: ${{ !matrix.settings.docker }}
shell: bash
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: packages/secrets/src/keyring/${{ env.APP_NAME }}.*.node
Expand Down Expand Up @@ -229,22 +229,22 @@ jobs:
- "20"
runs-on: ${{ matrix.settings.host }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
check-latest: true
cache: npm
- name: Install dependencies
run: npm ci --ignore-scripts
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: bindings-${{ matrix.settings.target }}
path: packages/secrets/src/keyring/
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
if: ${{ matrix.settings.platform }}
with:
platforms: ${{ matrix.settings.platform }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ${{ github.event.workflow_run.head_repository.full_name }}
ref: ${{ github.event.workflow_run.head_branch }}
Expand Down
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)
start-date: "2022-07-30T00:00:00Z"
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/zowe-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,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 }}
check-latest: true
Expand Down Expand Up @@ -105,10 +105,11 @@ jobs:
- name: Archive Binary
if: github.event.inputs.test-type == 'binary' || github.event_name == 'push'
id: upload-binary
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: zowe-${{ matrix.os }}.tgz
path: zowe.tgz
overwrite: true

- name: Setup Binary in PATH
if: github.event.inputs.test-type == 'binary' || github.event_name == 'push'
Expand Down Expand Up @@ -147,16 +148,17 @@ 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: __tests__/__results__/

- name: Upload Results to Codecov
if: ${{ always() && steps.build.outcome == 'success' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
env_vars: OS,NODE
token: ${{ secrets.CODECOV_TOKEN }}

release:
if: github.event_name == 'push' && github.ref_protected
Expand All @@ -165,15 +167,15 @@ jobs:

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

# Use Node 20. Currently the latest.
- name: Use Node.js 20
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '20'

Expand Down

0 comments on commit 957c244

Please sign in to comment.