Skip to content

Commit

Permalink
Merge branch 'main' into refactor-docs-firefox-browser-support
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Dec 10, 2023
2 parents 0653ead + 019476a commit 5d3e682
Show file tree
Hide file tree
Showing 1,715 changed files with 4,077 additions and 10,714 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/package-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ elif [[ $PRE_RELEASE == "true" ]]; then
echo "$VALID_SEMVER_VERSION"
else
echo "Version $SEMVER_VERSION doesn't contain a hyphen. A prerelease should have a hyphen!"
exit 1
exit 1
fi
else
echo "nothing found in environment for REALEASE or PRE_RELEASE"
Expand Down
19 changes: 19 additions & 0 deletions .github/scripts/release/upload-asset.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,25 @@ const uploadAsset = async ({
assetPath
}) => {
const { repo, owner } = context.repo;

const uploadRelease = await github.rest.repos.getRelease({
owner,
repo,
release_id
});

const { assets = [] } = uploadRelease.data;

const foundAsset = assets?.find((asset) => asset.name === assetName);

if (foundAsset) {
await github.rest.repos.deleteReleaseAsset({
owner,
repo,
asset_id: foundAsset.id
});
}

return await github.rest.repos.uploadReleaseAsset({
owner,
repo,
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/02-e2e-showcases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shard }}
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.35.1-focal
image: mcr.microsoft.com/playwright:v1.40.0
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -57,13 +57,11 @@ jobs:
HOME: /root
run: npm run test:${{ matrix.framework }}-showcase -- -- --shard=${{ matrix.shard }}

- name: 🆙 Upload blob report to GitHub Actions Artifacts
if: always()
uses: actions/upload-artifact@v3
with:
name: all-blob-reports
path: ./showcases/blob-report
retention-days: 1
- name: 🔣 Print GitHub Report
if: failure()
shell: bash
run: |
npx playwright merge-reports --reporter github ./blob-report
- name: 🆙 Upload test results
if: failure()
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/02-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
name: 🧪🎭 - ${{ matrix.framework }}:${{ matrix.shard }}
runs-on: ubuntu-latest
container:
image: mcr.microsoft.com/playwright:v1.35.1-focal
image: mcr.microsoft.com/playwright:v1.40.0
strategy:
fail-fast: false
matrix:
framework: [react, vue]
shard: [1/4, 2/4, 3/4, 4/4]
shard: [1/3, 2/3, 3/3]
steps:
- name: ⏬ Checkout repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -62,13 +62,12 @@ jobs:
HOME: /root
run: npx playwright test --shard=${{ matrix.shard }}

- name: 🆙 Upload blob report to GitHub Actions Artifacts
if: always()
uses: actions/upload-artifact@v3
with:
name: all-blob-reports
path: ./output/${{ steps.workingDirectory.outputs.dir }}/blob-report
retention-days: 1
- name: 🔣 Print GitHub Report
if: failure()
working-directory: ./output/${{ steps.workingDirectory.outputs.dir }}
shell: bash
run: |
npx playwright merge-reports --reporter github ./blob-report
- name: 🆙 Upload test results
if: failure()
Expand Down
38 changes: 0 additions & 38 deletions .github/workflows/03-e2e-merge-reports.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/99-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 🏷️ Labeler
uses: actions/labeler@v4
uses: actions/labeler@v5
continue-on-error: true
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ jobs:
uses: ./.github/workflows/02-e2e-showcases.yml
needs: [build-showcases]

merge-reports:
if: ${{ always() }}
uses: ./.github/workflows/03-e2e-merge-reports.yml
needs: [test-components, test-showcases]

checks-done:
if: ${{ always() }}
runs-on: ubuntu-latest
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ jobs:
uses: ./.github/workflows/02-e2e-showcases.yml
needs: [build-showcases]

merge-reports:
if: ${{ always() }}
uses: ./.github/workflows/03-e2e-merge-reports.yml
needs: [test-components, test-showcases]

checks-done:
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 1 addition & 3 deletions .lintstagedrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
export default {
'packages/foundations/assets/icons/functional/**/*.svg': () =>
'npm run update:icon-fonts',
'*.md': 'markdownlint -c .markdown-lint.yml',
'*.{css,scss}': 'stylelint --fix',
'*.{css,scss}': 'stylelint --fix --allow-empty-input',
'*.{js,ts,tsx,jsx,mjs,cjs}': ['prettier --write', 'xo --fix'],
'!*.{js,ts,tsx,jsx,mjs,cjs}': 'prettier --write --ignore-unknown'
};
5 changes: 3 additions & 2 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
}
},
{
"files": ["*.sh", ".env"],
"files": [".env"],
"options": {
"parser": "sh"
}
}
],
"endOfLine": "auto"
"endOfLine": "auto",
"plugins": ["prettier-plugin-sh", "prettier-plugin-pkg"]
}
Loading

0 comments on commit 5d3e682

Please sign in to comment.