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

Fix conflicts #2088

Merged
merged 1 commit into from
Dec 14, 2023
+13 −13
Merged

Fix conflicts #2088

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
matrix:
include:
- os: macos-latest
codecov_os: macos
os-name: macos
- os: ubuntu-latest
codecov_os: linux
os-name: linux
- os: windows-latest
codecov_os: windows
os-name: windows

steps:

Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
name: Upload coverage to Codecov
with:
file: ./artifacts/coverage/coverage.cobertura.xml
flags: ${{ matrix.codecov_os }}
flags: ${{ matrix.os-name }}

- name: Publish artifacts
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
Expand All @@ -112,23 +112,23 @@ jobs:
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: screenshots
name: screenshots-${{ matrix.os-name }}
path: ./artifacts/screenshots/*
if-no-files-found: ignore

- name: Publish traces
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: traces
name: traces-${{ matrix.os-name }}
path: ./artifacts/traces/*
if-no-files-found: ignore

- name: Publish videos
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: videos
name: videos-${{ matrix.os-name }}
path: ./artifacts/videos/*
if-no-files-found: ignore

Expand Down Expand Up @@ -212,23 +212,23 @@ jobs:
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: screenshots
name: screenshots-e2e-dev
path: ./artifacts/screenshots/*
if-no-files-found: ignore

- name: Publish traces
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: traces
name: traces-e2e-dev
path: ./artifacts/traces/*
if-no-files-found: ignore

- name: Publish videos
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: videos
name: videos-e2e-dev
path: ./artifacts/videos/*
if-no-files-found: ignore

Expand Down Expand Up @@ -310,22 +310,22 @@ jobs:
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: screenshots
name: screenshots-e2e-production
path: ./artifacts/screenshots/*
if-no-files-found: ignore

- name: Publish traces
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: traces
name: traces-e2e-production
path: ./artifacts/traces/*
if-no-files-found: ignore

- name: Publish videos
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
if: ${{ !cancelled() }}
with:
name: videos
name: videos-e2e-production
path: ./artifacts/videos/*
if-no-files-found: ignore