Skip to content

Commit

Permalink
merged master
Browse files Browse the repository at this point in the history
Signed-off-by: Pujal <[email protected]>
  • Loading branch information
pujal0909 committed Jan 17, 2025
2 parents 61ae685 + f86212e commit fa51517
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
audit:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout
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 @@ permissions:
jobs:
processLabelAction:
name: Process Label Action
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

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

jobs:
changelog:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ contains( github.event.pull_request.labels.*.name, 'no-changelog') != true }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
analyze:
name: Analyze with CodeQL
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-by-comments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
rfr_add_date:
name: "Post merge-by date as comment"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
pull-requests: write
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge-by-table.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
rfr_add_date:
name: "Build table and notify users"
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
discussions: write
pull-requests: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
release:

name: Create GitHub Release
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
ZOWEX_VERSION: ${{ steps.get-version.outputs.ZOWEX_VERSION }}

Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

needs: release

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Install Rust toolchain
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
build-linux:
name: Build Linux
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/secrets-sdk-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Secrets SDK Publish
jobs:
publish:
name: Publish
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
defaults:
run:
working-directory: packages/secrets
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/secrets-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,27 @@ jobs:
npm run build -- --target i686-pc-windows-msvc
npm run test
target: i686-pc-windows-msvc
- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-gnu
use-cross: true
build: |
set -e
CARGO=cross npm run build -- --target x86_64-unknown-linux-gnu
- host: ubuntu-latest
- host: ubuntu-22.04
target: i686-unknown-linux-gnu
use-cross: true
build: |
set -e
source scripts/configure-cross.sh i686-unknown-linux-gnu
CARGO=cross npm run build -- --target i686-unknown-linux-gnu
- host: ubuntu-latest
- host: ubuntu-22.04
target: armv7-unknown-linux-gnueabihf
use-cross: true
build: |
set -e
source scripts/configure-cross.sh armv7-unknown-linux-gnueabihf
CARGO=cross npm run build -- --target armv7-unknown-linux-gnueabihf
- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-musl
use-cross: true
build: |
Expand All @@ -67,14 +67,14 @@ jobs:
- host: macos-latest
target: aarch64-apple-darwin
build: npm run build -- --target aarch64-apple-darwin
- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-gnu
use-cross: true
build: |
set -e
source scripts/configure-cross.sh aarch64-unknown-linux-gnu
CARGO=cross npm run build -- --target aarch64-unknown-linux-gnu
- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-musl
use-cross: true
build: |
Expand Down Expand Up @@ -208,17 +208,17 @@ jobs:
- host: macos-latest
target: x86_64-apple-darwin
architecture: x64
- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-gnu
- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-musl
- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-gnu
platform: linux/arm64
- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-musl
platform: linux/arm64
- host: ubuntu-latest
- host: ubuntu-22.04
target: armv7-unknown-linux-gnueabihf
platform: linux/arm/v7
node:
Expand Down Expand Up @@ -251,10 +251,10 @@ jobs:
if: ${{ matrix.settings.platform }}
- name: Test bindings
run: npm run test
if: ${{ matrix.settings.host != 'ubuntu-latest' }}
if: ${{ matrix.settings.host != 'ubuntu-22.04' }}
- name: Setup and run tests
uses: addnab/docker-run-action@v3
if: ${{ matrix.settings.host == 'ubuntu-latest' && !endsWith(matrix.settings.target, 'musl') }}
if: ${{ matrix.settings.host == 'ubuntu-22.04' && !endsWith(matrix.settings.target, 'musl') }}
with:
image: ${{ format('node:{0}-slim', matrix.node) }}
options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}"
Expand All @@ -264,7 +264,7 @@ jobs:
cd packages/secrets && dbus-run-session -- bash scripts/linux-test.sh
- name: Setup and run tests (MUSL)
uses: addnab/docker-run-action@v3
if: ${{ matrix.settings.host == 'ubuntu-latest' && endsWith(matrix.settings.target, 'musl') }}
if: ${{ matrix.settings.host == 'ubuntu-22.04' && endsWith(matrix.settings.target, 'musl') }}
with:
image: ${{ format('node:{0}-alpine', matrix.node) }}
options: "-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK ${{ matrix.settings.platform && format('--platform={0}', matrix.settings.platform) }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
sonar:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: github.event.workflow_run.conclusion == 'success'

steps:
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Configure Sonar Scan
uses: zowe-actions/octorelease/script@v1
env:
COVERAGE_ARTIFACT: "ubuntu-latest-20.x-results:__tests__/__results__"
COVERAGE_ARTIFACT: "Linux-20.x-results:__tests__/__results__"
with:
script: sonarConfig

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

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/stale@v9
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:
jobs:
update-project:
name: Move project item
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: zowe-actions/shared-actions/project-move-item@main
if: ${{ github.event.issue && fromJSON(env.ISSUE_STATUSES)[github.event.label.name] }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/zowe-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
node-version: [18.x, 20.x, 22.x]
os:
- windows-latest
- ubuntu-latest
- ubuntu-22.04
- ${{ github.event.inputs.macos-type || 'macos-14'}}

env:
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
# Ignore conflict if multiple jobs upload artifact at same time: https://github.com/actions/upload-artifact/issues/506
continue-on-error: true
with:
name: zowe-${{ matrix.os }}.tgz
name: zowe-${{ runner.os }}.tgz
path: zowe.tgz
overwrite: true

Expand All @@ -114,7 +114,7 @@ jobs:

- name: Unlock Keyring
id: unlock-keyring
if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-latest' }}
if: ${{ always() && steps.build.outcome == 'success' && matrix.os == 'ubuntu-22.04' }}
uses: t1m0thyj/unlock-keyring@v1

- name: Start Daemon
Expand All @@ -135,7 +135,7 @@ jobs:
if: ${{ always() && steps.build.outcome == 'success' }}
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-${{ matrix.node-version }}-results
name: ${{ runner.os }}-${{ matrix.node-version }}-results
path: __tests__/__results__/

- name: Upload Results to Codecov
Expand All @@ -148,7 +148,7 @@ jobs:
release:
if: github.event_name == 'push' && github.ref_protected
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
issues: write
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zoweReleaseVersion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:

jobs:
update_versions_and_create_pr:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout CLI Repo
Expand Down
6 changes: 3 additions & 3 deletions scripts/testCliWorkflow.js
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,9 @@ Usage:
- npm run test: act -- --node 16.x --dr
- npm run test: act -- --node 16.x --verbose
- npm run test: act -- --node 16.x, 14.x
- npm run test: act -- --node 16.x, 14.x --os ubuntu-latest
- npm run test: act -- --node 16.x, 14.x --os ubuntu-latest, windows-latest
- npm run test: act -- --node 16.x --os ubuntu-latest --ap ubuntu-latest=nektos/act-environments-ubuntu:18.04
- npm run test: act -- --node 16.x, 14.x --os ubuntu-22.04
- npm run test: act -- --node 16.x, 14.x --os ubuntu-22.04, windows-latest
- npm run test: act -- --node 16.x --os ubuntu-22.04 --ap ubuntu-22.04=nektos/act-environments-ubuntu:18.04
`);
}

Expand Down

0 comments on commit fa51517

Please sign in to comment.