Skip to content

Commit

Permalink
Merge branch 'main' into refactor/replace-got/dev-miscellaneous.test.js
Browse files Browse the repository at this point in the history
  • Loading branch information
mrstork committed May 9, 2024
2 parents 9e0cf9c + 2d20fe2 commit c18d231
Show file tree
Hide file tree
Showing 24 changed files with 1,699 additions and 458 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: lts/*
cache: npm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ jobs:

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

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
config-file: ./.github/codeql/codeql-config.yml
languages: 'javascript'

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
2 changes: 1 addition & 1 deletion .github/workflows/docsearch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
run-search:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: darrenjennings/algolia-docsearch-action@75b0f6d28d82eff3dd76f57a96a99490df11a250
with:
algolia_application_id: '4RTNPM1QF9'
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,23 @@ jobs:
strategy:
matrix:
os: [windows-latest]
node-version: ['18.14.0', '20']
# Temporary workaround due to this https://github.com/nodejs/node/issues/52682
# node-version: ['18.14.0', '20', '22']
# Pinning 20.x version as a temporary workaround due to this https://github.com/nodejs/node/issues/52884
node-version: ['18.14.0', '20.12.2', '22']
fail-fast: false

steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
check-latest: true
- name: Cache verdaccio storage
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./.verdaccio-storage
key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
Expand Down Expand Up @@ -74,17 +73,17 @@ jobs:

steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
check-latest: true
- name: Cache verdaccio storage
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ./.verdaccio-storage
key: verdaccio-e2e-cli-${{ hashFiles('./package-lock.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
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: Download fossa cli
run: |-
mkdir -p $HOME/.local/bin
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
node-version: ['18.14.0', '20', '22']
# Pinning 20.x version as a temporary workaround due to this https://github.com/nodejs/node/issues/52884
node-version: ['18.14.0', '20.12.2', '22']
shard: ['1/4', '2/4', '3/4', '4/4']

exclude:
Expand All @@ -41,12 +42,12 @@ jobs:
REG ADD HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TCPIP\Parameters /v TcpTimedWaitDelay /t REG_DWORD /d 30 /f
if: "${{ matrix.os == 'windows-latest' && !steps.release-check.outputs.IS_RELEASE }}"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
if: '${{!steps.release-check.outputs.IS_RELEASE}}'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand All @@ -73,7 +74,7 @@ jobs:
run: npm run test:init
if: '${{ !steps.release-check.outputs.IS_RELEASE }}'
- name: Tests
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
if: '${{ !steps.release-check.outputs.IS_RELEASE }}'
with:
timeout_minutes: 15
Expand Down Expand Up @@ -111,7 +112,7 @@ jobs:
path: |
/home/runner/.npm/_logs/**/*
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
continue-on-error: true
with:
flags: ${{ steps.test-coverage-flags.outputs.os }},${{ steps.test-coverage-flags.outputs.node }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
id-token: write
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: npm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
private-key: ${{ secrets.TOKENS_PRIVATE_KEY }}
app-id: ${{ secrets.TOKENS_APP_ID }}

- uses: GoogleCloudPlatform/release-please-action@v3
- uses: GoogleCloudPlatform/release-please-action@v4
id: release
with:
token: ${{ steps.get-token.outputs.token }}
Expand All @@ -31,9 +31,9 @@ jobs:
needs: create-release
if: ${{ needs.create-release.outputs.release_created }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: lts/*
cache: npm
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
echo "IS_RELEASE=true" >> $env:GITHUB_OUTPUT
if: "${{ startsWith(github.head_ref, 'release-') }}"
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
if: '${{!steps.release-check.outputs.IS_RELEASE}}'
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: npm
Expand All @@ -44,7 +44,7 @@ jobs:
run: npm run format:ci
if: '${{!steps.release-check.outputs.IS_RELEASE}}'
- name: Run unit tests
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 15
max_attempts: 3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download styles
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
timeout-minutes: 10
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: lts/*
cache: npm
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).



## [17.23.2](https://github.com/netlify/cli/compare/v17.23.1...v17.23.2) (2024-05-07)


### Bug Fixes

* bump node in CI actions ([#6542](https://github.com/netlify/cli/issues/6542)) ([2c27e2c](https://github.com/netlify/cli/commit/2c27e2c167ad1e153aab8b606db4ced8db9143f3))
* **deps:** update dependency chalk to v5.3.0 ([#6537](https://github.com/netlify/cli/issues/6537)) ([8803309](https://github.com/netlify/cli/commit/8803309af3ece5855f5789f4785bac03d27f826b))
* **deps:** update dependency chokidar to v3.6.0 ([#6538](https://github.com/netlify/cli/issues/6538)) ([0ca4ac8](https://github.com/netlify/cli/commit/0ca4ac8a5b2eab93659d33f4b36ccad6ca572408))
* do not prompt for project if `--cwd` was provided ([#6362](https://github.com/netlify/cli/issues/6362)) ([7e13196](https://github.com/netlify/cli/commit/7e131964dc6579e19c2bb58f8f1a7c30ec431bce)), closes [#5977](https://github.com/netlify/cli/issues/5977)
* don't prompt for input when running in CI ([#6541](https://github.com/netlify/cli/issues/6541)) ([a3c496b](https://github.com/netlify/cli/commit/a3c496bd8ba08c4b684101625dde3c64826e7af5))

## [17.23.1](https://github.com/netlify/cli/compare/v17.23.0...v17.23.1) (2024-04-25)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"author": "Netlify",
"license": "MIT",
"dependencies": {
"@netlify/functions": "^2.6.0"
"@netlify/functions": "^2.6.3"
}
}

0 comments on commit c18d231

Please sign in to comment.