Skip to content

Commit

Permalink
Merge branch 'main' into ct-1000/remove-integration-level-requirement…
Browse files Browse the repository at this point in the history
…-for-integrations
  • Loading branch information
khendrikse authored May 13, 2024
2 parents e801ece + 5e716c0 commit de3ac49
Show file tree
Hide file tree
Showing 26 changed files with 1,752 additions and 1,021 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# This posts the status to the PR/commit
- uses: haya14busa/action-workflow_run-status@v1
- name: Download deltas
uses: dawidd6/action-download-artifact@v2
uses: dawidd6/action-download-artifact@v3
with:
# This is the workflow that triggered this run
workflow: ${{ github.event.workflow.id }}
Expand Down
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
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).



## [17.23.3](https://github.com/netlify/cli/compare/v17.23.2...v17.23.3) (2024-05-13)


### Bug Fixes

* **deps:** update dependency @netlify/edge-functions to v2.6.1 ([#6547](https://github.com/netlify/cli/issues/6547)) ([9fb7d77](https://github.com/netlify/cli/commit/9fb7d77e6c53ca4c15a25ab6750bd9446fab0576))
* **deps:** update dependency @netlify/edge-functions to v2.7.0 ([#6570](https://github.com/netlify/cli/issues/6570)) ([366b156](https://github.com/netlify/cli/commit/366b1562e9039a1c4639f6bd6bee10752a6395b9))
* **deps:** update dependency @netlify/zip-it-and-ship-it to v9.32.2 ([#6560](https://github.com/netlify/cli/issues/6560)) ([2f67773](https://github.com/netlify/cli/commit/2f67773c360efd09d47685a68264aef1d068388a))
* **deps:** update dependency semver to v7.6.2 ([#6577](https://github.com/netlify/cli/issues/6577)) ([6887884](https://github.com/netlify/cli/commit/68878842d35be3e4f5ff21f9f6defcd30723e1b1))
* **deps:** update netlify packages ([#6565](https://github.com/netlify/cli/issues/6565)) ([b783823](https://github.com/netlify/cli/commit/b7838235bb1b75b19207b3e4304e5159945849ab))
* framework detection test race condition ([#6564](https://github.com/netlify/cli/issues/6564)) ([a79430f](https://github.com/netlify/cli/commit/a79430fd17d88a850f365fd8fdaceae521fcc42f))
* respect `excludedPattern` defined in netlify.toml ([#6533](https://github.com/netlify/cli/issues/6533)) ([1729ef0](https://github.com/netlify/cli/commit/1729ef006ef364e9f5a6433ca1fefc54ba648f8f))
* specified dev command should fix the case of multiple detected commands ([#6579](https://github.com/netlify/cli/issues/6579)) ([e48529e](https://github.com/netlify/cli/commit/e48529ee1c975f35db28f3ca3182e6375b104927))

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


Expand Down
Loading

0 comments on commit de3ac49

Please sign in to comment.