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 to node20 #3594

Merged
merged 4 commits into from
Mar 28, 2024
Merged

update to node20 #3594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba3fa8e
update to node20
vhvb1989 Mar 25, 2024
f336a02
update terraform azurerm version
vhvb1989 Mar 26, 2024
fa6f3ed
Merge branch 'main' of github.com:Azure/azure-dev into update-node-ru…
vhvb1989 Mar 28, 2024
76e549a
node function fix
vhvb1989 Mar 28, 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
8 changes: 4 additions & 4 deletions .github/workflows/cli-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-go@v3
with:
go-version: "^1.21.0"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
Expand All @@ -33,10 +33,10 @@ jobs:
cspell-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: npm install -g cspell
- name: Spell check for CLI source code
run: cspell lint '**/*.go' --config ./cli/azd/.vscode/cspell.yaml --root ./cli/azd --no-progress
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cspell-misc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
cspell-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: npm install -g cspell
- name: Spell check for general files
run: cspell lint '**/*' --config ./.vscode/cspell.misc.yaml --relative --no-progress
2 changes: 1 addition & 1 deletion .github/workflows/devcontainer-feature-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
environment:
name: deploy-devcontainer-feature
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Publish Features"
uses: devcontainers/action@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/devcontainer-feature-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
"mcr.microsoft.com/devcontainers/base:debian",
]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Install latest devcontainer CLI"
run: npm install -g @devcontainers/cli
Expand All @@ -37,7 +37,7 @@ jobs:
test-scenarios:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Install latest devcontainer CLI"
run: npm install -g @devcontainers/cli
Expand All @@ -49,7 +49,7 @@ jobs:
test-global:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: "Install latest devcontainer CLI"
run: npm install -g @devcontainers/cli
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/devops-ext-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- name: Install dependencies
run: |
npm install -g npm
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-bicep.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
bicep-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Lint .bicep files
run: $ErrorActionPreference='Continue'; eng/scripts/Test-BicepLint.ps1 -Verbose
shell: pwsh
4 changes: 2 additions & 2 deletions .github/workflows/schema-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: npm install -g jsonlint
- name: Validate schemas JSON
run: jsonlint schemas/**/*.json -c
6 changes: 3 additions & 3 deletions .github/workflows/templates-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
cspell-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: npm install -g cspell
- name: Spell check for templates
run: cspell lint '**/*' --config ./templates/cspell.yaml --root ./templates --no-progress
12 changes: 6 additions & 6 deletions .github/workflows/vscode-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
cspell-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "18"
node-version: "20"
- run: npm install -g cspell
- name: Spell check for vscode extension
run: cspell lint '**/*.ts' --config ./ext/vscode/.vscode/cspell.yaml --root ./ext/vscode --no-progress
Expand All @@ -28,17 +28,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
os: [macos-latest, ubuntu-latest, windows-latest]
include:
- os: ubuntu-latest
upload-artifact: true

steps:
- 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 }}

Expand Down
8 changes: 4 additions & 4 deletions cli/azd/test/functional/testdata/recordings/Test_CLI_DevCenter_Init_Up_Down.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/azd/test/functional/testdata/samples/resourcegroupterraform/infra/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ terraform {
required_version = ">= 1.1.7, < 2.0.0"
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion cli/azd/test/functional/testdata/samples/resourcegroupterraformremote/infra/provider.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ terraform {
}
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/aks/nodejs/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/java/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/java/terraform/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/nodejs/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/nodejs/func/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.devcontainer/devcontainer.json/nodejs/terraform/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Azure Developer CLI",
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bullseye",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {
},
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.github/workflows/func/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion templates/common/.github/workflows/java/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions templates/common/.github/workflows/java/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]
Expand All @@ -29,7 +29,7 @@ jobs:
chmod +x ${GITHUB_WORKSPACE}/src/api/mvnw
- name: Install Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions templates/common/.github/workflows/nodejs/bicep/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]

- name: Install Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions templates/common/.github/workflows/nodejs/func/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]

- name: Install Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions templates/common/.github/workflows/nodejs/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]

- name: Install Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions templates/common/.github/workflows/terraform/azure-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install azd
uses: Azure/[email protected]

- name: Install Nodejs
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/database/cosmos/cosmos.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/database/postgresql/postgresql.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ locals {
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/gateway/apim-api/apim-api.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/gateway/apim/apim.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/host/appservice/appservicejava/appservicejava.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/host/appservice/appservicenode/appservicenode.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
2 changes: 1 addition & 1 deletion ...es/common/infra/terraform/core/host/appservice/appservicenode/appservicenode_variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ variable "resource_token" {
variable "node_version" {
description = "the application stack node version to set for the app service."
type = string
default = "18-lts"
default = "20-lts"
}

variable "always_on" {
Expand Down
2 changes: 1 addition & 1 deletion templates/common/infra/terraform/core/host/appservice/appservicepython/appservicepython.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
terraform {
required_providers {
azurerm = {
version = "~>3.47.0"
version = "~>3.97.1"
source = "hashicorp/azurerm"
}
azurecaf = {
Expand Down
Loading
Loading