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.

Sign up for GitHub

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

Jump to bottom

Update setup actions to v4 for Node and Java #25561

Merged
merged 3 commits into from
Mar 20, 2024
Merged

Update setup actions to v4 for Node and Java #25561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d131952
Update setup actions to v4 for Node and Java
mraible Mar 20, 2024
c1b6542
Fix Snyk CLI download
mraible Mar 20, 2024
df847ae
Update snapshots
mraible Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-default-node-java/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ runs:
- uses: actions/setup-node@v4
with:
node-version: 18.19.0
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
34 changes: 17 additions & 17 deletions generators/ci-cd/__snapshots__/ci-cd.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,14 +958,14 @@ jobs:
NG_CLI_ANALYTICS: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: NODE_VERSION
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: JAVA_VERSION
- name: Install node.js packages
- name: Install Node.js packages
run: npm install
- name: Run backend test
run: |
Expand Down Expand Up @@ -1031,18 +1031,18 @@ jobs:
NG_CLI_ANALYTICS: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: NODE_VERSION
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: JAVA_VERSION
- name: Install node.js packages
- name: Install Node.js packages
run: npm install
- name: Install Snyk CLI
run: |
curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \\" | tr -d ' ')
curl --compressed https://static.snyk.io/cli/latest/snyk-linux -o snyk
chmod +x snyk
- name: Snyk test
continue-on-error: true
Expand Down Expand Up @@ -1181,14 +1181,14 @@ jobs:
NG_CLI_ANALYTICS: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: NODE_VERSION
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: JAVA_VERSION
- name: Install node.js packages
- name: Install Node.js packages
run: npm install
- name: Run backend test
run: |
Expand Down Expand Up @@ -1248,18 +1248,18 @@ jobs:
NG_CLI_ANALYTICS: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: NODE_VERSION
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: JAVA_VERSION
- name: Install node.js packages
- name: Install Node.js packages
run: npm install
- name: Install Snyk CLI
run: |
curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \\" | tr -d ' ')
curl --compressed https://static.snyk.io/cli/latest/snyk-linux -o snyk
chmod +x snyk
- name: Snyk test
continue-on-error: true
Expand Down Expand Up @@ -1417,14 +1417,14 @@ jobs:
NG_CLI_ANALYTICS: false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: NODE_VERSION
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: JAVA_VERSION
- name: Install node.js packages
- name: Install Node.js packages
run: npm install
- name: Run backend test
run: |
Expand Down
8 changes: 4 additions & 4 deletions generators/ci-cd/templates/.github/workflows/main.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,24 @@ if (!databaseTypeNo && !skipServer ) { _%>
steps:
- uses: actions/checkout@v4
<%_ if (!skipClient) { _%>
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: <%= nodeVersion %>
<%_ }
if (!skipServer) { _%>
- uses: actions/setup-java@v3
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: <%= javaVersion %>
<%_ }
if (!skipClient) { _%>
- name: Install node.js packages
- name: Install Node.js packages
run: <%= clientPackageManager %> install
<%_ } _%>
<%_ if (ciCdIntegrationsSnyk) { _%>
- name: Install Snyk CLI
run: |
curl -Lo ./snyk $(curl -s https://api.github.com/repos/snyk/snyk/releases/latest | grep "browser_download_url.*snyk-linux" | cut -d ':' -f 2,3 | tr -d \" | tr -d ' ')
curl --compressed https://static.snyk.io/cli/latest/snyk-linux -o snyk
chmod +x snyk
- name: Snyk test
continue-on-error: true
Expand Down
2 changes: 1 addition & 1 deletion generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: <%- nodeVersion.split('.', 2)[0] %>
cache: 'npm'
Expand Down