Skip to content

Commit

Permalink
chore: merge main branch (#1956)
Browse files Browse the repository at this point in the history
* merge

Signed-off-by: achmelo <[email protected]>
  • Loading branch information
achmelo authored Dec 7, 2021
1 parent b5ca86a commit b895d58
Show file tree
Hide file tree
Showing 12 changed files with 625 additions and 445 deletions.
27 changes: 15 additions & 12 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Set up Node
uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install -g [email protected]
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
Expand All @@ -27,17 +32,16 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Build with Gradle
run: >
./gradlew build runStartUpCheck --info -Partifactory_user=${{ secrets.ARTIFACTORY_USERNAME }} -Partifactory_password=${{ secrets.ARTIFACTORY_PASSWORD }}
Expand Down Expand Up @@ -75,17 +79,16 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Build with Gradle
run: >
./gradlew --info coverage sonarqube
Expand Down
175 changes: 79 additions & 96 deletions .github/workflows/containers.yml

Large diffs are not rendered by default.

31 changes: 12 additions & 19 deletions .github/workflows/create-image-without-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install -g npm@7.20.5
- run: npm install -g npm@8.1.0
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
Expand All @@ -41,18 +41,15 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Build with Gradle
run: ./gradlew build

Expand Down Expand Up @@ -94,17 +91,15 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- uses: zowe-actions/shared-actions/prepare-workflow@main

Expand Down Expand Up @@ -174,17 +169,15 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- uses: zowe-actions/shared-actions/prepare-workflow@main

Expand Down
21 changes: 8 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install -g npm@7.20.5
- run: npm install -g npm@8.1.0
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
Expand All @@ -44,18 +44,15 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Build with Gradle
run: ./gradlew build

Expand Down Expand Up @@ -129,17 +126,15 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- uses: zowe-actions/shared-actions/prepare-workflow@main

Expand Down
21 changes: 8 additions & 13 deletions .github/workflows/snapshot-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install -g npm@7.20.5
- run: npm install -g npm@8.1.0
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
Expand All @@ -37,18 +37,15 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Release with Gradle
run: ./gradlew build publishAllVersions -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_USERNAME
env:
Expand Down Expand Up @@ -90,17 +87,15 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- uses: zowe-actions/shared-actions/prepare-workflow@main

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/specific-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '14'
- run: npm install -g [email protected]
- run: npm install -g [email protected]

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Cache Gradle packages
Expand All @@ -43,18 +44,19 @@ jobs:
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Cache Node.js modules
id: node-cache
uses: actions/cache@v2
with:
path: |
~/.npm
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node-
${{ runner.OS }}-
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- name: Print npm version
run: npm -v

- name: Build with Gradle
run: ./gradlew build

Expand Down Expand Up @@ -126,17 +128,15 @@ jobs:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle001-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle001-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}

- name: Cache Node.js modules
uses: actions/cache@v2
with:
path: |
~/.npm
key: ${{ runner.OS }}-node001-${{ hashFiles('**/package-lock.json, **/package.json') }}
restore-keys: |
${{ runner.OS }}-node001-
**/node_modules
key: ${{ runner.OS }}-node-${{ hashFiles('**/package-lock.json', '**/package.json') }}

- uses: zowe-actions/shared-actions/prepare-workflow@main

Expand Down
2 changes: 1 addition & 1 deletion api-catalog-ui/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import java.util.stream.Collectors

plugins {
id "com.github.node-gradle.node" version "3.0.1"
id "com.github.node-gradle.node" version "3.1.1"
}

node {
Expand Down
Loading

0 comments on commit b895d58

Please sign in to comment.