Skip to content

Commit

Permalink
Merge branch 'dev' into feat/table-striped
Browse files Browse the repository at this point in the history
  • Loading branch information
MajesticPotatoe authored Feb 14, 2025
2 parents ac5abbd + acff32f commit 3ebef47
Show file tree
Hide file tree
Showing 941 changed files with 36,804 additions and 178,508 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

github: [johnleider, KaelWD, MajesticPotatoe]
github: [johnleider, KaelWD, MajesticPotatoe, yuwu9145]
patreon: vuetify
open_collective: vuetify
ko_fi: # Replace with a single Ko-fi username
Expand Down
31 changes: 0 additions & 31 deletions .github/actions/download-artifact/action.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/actions/download-locales/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ runs:
push_translations: false
export_only_approved: false
crowdin_branch_name: ${{ inputs.crowdin-branch }}
- name: Download ja-JP
uses: crowdin/[email protected]
with:
download_language: ja
config: crowdin.yml
upload_sources: false
download_translations: true
push_translations: false
export_only_approved: false
crowdin_branch_name: ${{ inputs.crowdin-branch }}
- name: Download zh-CN
uses: crowdin/[email protected]
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/actions/nightly-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ runs:
repository: ${{ inputs.checkout-repo }}
ref: ${{ inputs.checkout-ref }}
fetch-depth: 0
- uses: ./.github/actions/yarn-install
- uses: vuetifyjs/setup-action@master
- run: >-
node -e "
const json = require('./lerna.json');
Expand All @@ -45,9 +45,9 @@ runs:
- id: get-version
run: echo "full-version=$(node -e "console.log(require('./lerna.json').version)")-${{ inputs.release-id }}" >> $GITHUB_OUTPUT
shell: bash
- run: yarn lerna version ${{ steps.get-version.outputs.full-version }} --no-push --no-commit-hooks --force-publish --yes
- run: pnpm lerna version ${{ steps.get-version.outputs.full-version }} --no-push --no-commit-hooks --force-publish --yes
shell: bash
- run: yarn conventional-changelog -p angular --outfile ./packages/vuetify/CHANGELOG.md -r 2
- run: pnpm conventional-changelog -p vuetify --outfile ./packages/vuetify/CHANGELOG.md -r 2
shell: bash
- run: >-
node -e "fs.writeFileSync(
Expand All @@ -56,9 +56,9 @@ runs:
)"
shell: bash
working-directory: ./packages/vuetify
- run: yarn lerna run build --scope @vuetify/nightly
- run: pnpm lerna run build --scope @vuetify/nightly
shell: bash
- run: yarn lerna run build --scope @vuetify/api-generator
- run: pnpm lerna run build --scope @vuetify/api-generator
shell: bash
- name: NPM Release
run: |
Expand Down
46 changes: 0 additions & 46 deletions .github/actions/upload-artifact/action.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .github/actions/yarn-install/action.yml

This file was deleted.

100 changes: 46 additions & 54 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
pre_job:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
should_skip: ${{ steps.skip_check.outputs.should_skip }}
steps:
Expand All @@ -28,85 +28,74 @@ jobs:
name: Build vuetify
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn build vuetify
- uses: ./.github/actions/upload-artifact
- uses: vuetifyjs/setup-action@master
- run: pnpm build vuetify
- uses: actions/upload-artifact@v4
with:
name: vuetify-dist
path: >
path: |
packages/vuetify/dist
packages/vuetify/lib
lint:
name: Lint
needs: [pre_job, build-vuetify]
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
scopes: ['--scope vuetify --scope @vuetify/api-generator', '--scope vuetifyjs.com']
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
- uses: ./.github/actions/yarn-install
- run: yarn lerna run lint $SCOPES
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm lerna run lint $SCOPES
env:
SCOPES: ${{ matrix.scopes }}

test-jest:
name: Test (Jest)
test-unit:
name: Test (Unit)
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn run test:coverage -i
- uses: vuetifyjs/setup-action@master
- run: pnpm run test --project unit
working-directory: ./packages/vuetify
- uses: codecov/codecov-action@v4

test-cypress:
name: Test (Cypress)
test-e2e:
name: Test (e2e)
needs: pre_job
if: needs.pre_job.outputs.should_skip != 'true'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/yarn-install
- run: yarn cy:run --record --parallel --ci-build-id $GITHUB_RUN_ID
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs' }}
- uses: vuetifyjs/setup-action@master
- run: pnpm run test --project browser
working-directory: ./packages/vuetify
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- run: yarn cy:run
if: ${{ !startswith(github.ref, 'refs/tags/v') && github.repository_owner != 'vuetifyjs' }}
working-directory: ./packages/vuetify
- uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
path: ./packages/vuetify/cypress/screenshots/
if-no-files-found: ignore

deploy:
needs: [lint, test-jest, test-cypress, build-vuetify]
runs-on: ubuntu-latest
needs: [lint, test-unit, test-e2e, build-vuetify]
runs-on: ubuntu-24.04
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: ./.github/actions/download-artifact
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
- uses: ./.github/actions/yarn-install
- run: yarn build api
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm build api
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: NPM Release
run: bash scripts/deploy.sh
Expand All @@ -115,7 +104,7 @@ jobs:
RELEASE_TAG: ${{ env.RELEASE_TAG }}
- name: GitHub release
id: create_release
run: yarn conventional-github-releaser -p vuetify
run: pnpm conventional-github-releaser -p vuetify
env:
DEBUG: '*'
CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -124,16 +113,17 @@ jobs:
name: Build docs
needs: [pre_job, build-vuetify]
if: needs.pre_job.outputs.should_skip != 'true' && github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/next')
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
- uses: ./.github/actions/yarn-install
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- uses: ./.github/actions/download-locales
- run: yarn build api
- run: yarn build docs
- run: pnpm build api
- run: pnpm build docs
env:
NODE_OPTIONS: --max-old-space-size=4096
VITE_COSMIC_2_BUCKET_SLUG: ${{ secrets.COSMIC_2_BUCKET_SLUG }}
Expand All @@ -147,22 +137,24 @@ jobs:
VITE_EMAILJS_TEMPLATE_ID: ${{ secrets.EMAILJS_TEMPLATE_ID }}
VITE_API_SERVER_URL: ${{ secrets.API_SERVER_URL }}
VITE_GITHUB_SHA: ${{ github.sha }}
- uses: ./.github/actions/upload-artifact
- uses: actions/upload-artifact@v4
with:
name: docs-dist
path: packages/docs/dist

publish-docs:
needs: [lint, test-jest, build-docs]
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/next')
needs: [lint, test-unit, build-docs]
runs-on: ubuntu-24.04
environment: ${{ github.ref_name }}
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/download-artifact
- uses: actions/download-artifact@v4
with:
name: docs-dist
- uses: ./.github/actions/yarn-install
- run: yarn global add vercel
- run: node scripts/deploy-and-alias.js ${{ github.ref }}
env:
NOW_TOKEN: ${{ secrets.NOW_TOKEN }}
path: packages/docs/dist
- uses: vuetifyjs/coolify-action@master
with:
token: ${{ secrets.GITHUB_TOKEN }}
imageName: docs
coolifyWebhook: ${{ secrets.COOLIFY_WEBHOOK }}
coolifySecret: ${{ secrets.COOLIFY_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/close-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:

jobs:
close:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: github.repository_owner == 'vuetifyjs'
steps:
- uses: vuetifyjs/close-action@master
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/crowdin-uploads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ env:

jobs:
upload-to-crowdin:
runs-on: ubuntu-latest

runs-on: ubuntu-24.04
steps:

- name: Checkout
uses: actions/checkout@v4

- name: Upload
uses: crowdin/[email protected]
with:
config: crowdin.yml
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
- name: Checkout
uses: actions/checkout@v4
- name: Upload
uses: crowdin/[email protected]
with:
config: crowdin.yml
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
2 changes: 1 addition & 1 deletion .github/workflows/nightly-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v4
Expand Down
Loading

0 comments on commit 3ebef47

Please sign in to comment.