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

ci: fix e2e report workflow missing netlify CLI #2673

Merged
merged 2 commits into from
Oct 16, 2024
+39,796 −12,470
Merged

ci: fix e2e report workflow missing netlify CLI #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3842695
chore(deps): use netlify-cli dev dep where possible
serhalp Oct 16, 2024
a14fb6f
ci: run next.js deps with netlify-cli dev dep
serhalp Oct 16, 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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ jobs:
- name: Deploy e2e page
if: success()
run: |
ntl deploy --build --cwd e2e-report
npx netlify deploy --build --cwd e2e-report
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the npx changes are because when binaries are installed locally, GitHub doesn't automatically add ./node_modules/.bin to the PATH. Just using npx is the right approach I think.

19 changes: 9 additions & 10 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
else
echo "matrix=[\"latest\"]" >> $GITHUB_OUTPUT
fi

e2e:
needs: setup
runs-on: ubuntu-latest
Expand Down Expand Up @@ -68,14 +69,13 @@ jobs:
deno-version: v1.37.0
- name: 'Install dependencies'
run: npm ci
- name: 'Netlify Login'
- name: 'Prepare Netlify CLI'
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
run: |
# TODO(serhalp) Unpin version once
# https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
npm i -g [email protected]
netlify login
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice hack :)

npx netlify login
- name: Get installed Playwright version
id: playwright-version
run: echo "version=$(npm view @playwright/test version)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -204,14 +204,13 @@ jobs:
run: npm ci
- name: 'Build'
run: npm run build
- name: 'Netlify Login'
- name: 'Prepare Netlify CLI'
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
run: |
# TODO(serhalp) Unpin version once
# https://netlify.slack.com/archives/C07686YAY13/p1718139257978049 is resolved.
npm i -g [email protected]
netlify login
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NIT: you could pull this out into a reusable action in github actions.

Something like .github/actions/netlify


name: 'Install Netlify CLI'
description: some description
runs:
  using: 'composite'
  steps:
    -  run: |
          # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
          npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
          npx netlify login

npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
npx netlify login
- name: Resolve Next.js version
id: resolve-next-version
shell: bash
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,9 @@ jobs:
run: npm run build
working-directory: ${{ env.runtime-path }}

- name: add netlify cli
run: npm install -g netlify-cli
- name: Prepare Netlify CLI
# Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
run: npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"

- name: Install Playwright Browsers
run: npx playwright install --with-deps
Expand Down
Loading
Loading