Skip to content

Commit

Permalink
Merge branch 'dev' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
KaelWD committed Feb 4, 2025
2 parents 6bd18de + 602214e commit a42281f
Show file tree
Hide file tree
Showing 341 changed files with 3,949 additions and 2,917 deletions.
2 changes: 1 addition & 1 deletion .github/actions/nightly-release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ runs:
shell: bash
- run: pnpm lerna version ${{ steps.get-version.outputs.full-version }} --no-push --no-commit-hooks --force-publish --yes
shell: bash
- run: pnpm 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 Down
34 changes: 21 additions & 13 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,11 +28,17 @@ 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: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: vuetifyjs/setup-action@master
- run: pnpm build vuetify
- run: pnpm build:lib
working-directory: ./packages/vuetify
- run: ucacher pnpm build:dist
working-directory: ./packages/vuetify
- run: ucacher pnpm build:types
working-directory: ./packages/vuetify
- uses: actions/upload-artifact@v4
with:
name: vuetify-dist
Expand All @@ -44,27 +50,28 @@ jobs:
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: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm lerna run lint $SCOPES
- run: ucacher pnpm lerna run lint $SCOPES
env:
SCOPES: ${{ matrix.scopes }}

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: vuetifyjs/setup-action@master
Expand All @@ -75,7 +82,7 @@ jobs:
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: vuetifyjs/setup-action@master
Expand All @@ -84,9 +91,10 @@ jobs:

deploy:
needs: [lint, test-unit, test-e2e, build-vuetify]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/v') && github.repository_owner == 'vuetifyjs'
steps:
- uses: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -95,7 +103,7 @@ jobs:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- run: pnpm build api
- run: ucacher pnpm build api
- run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
- name: NPM Release
run: bash scripts/deploy.sh
Expand All @@ -113,16 +121,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: earthly/setup-ucacher@b99687d79dd75262bfc326b9e5ad3a520385a18b
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
with:
name: vuetify-dist
path: packages/vuetify
- uses: vuetifyjs/setup-action@master
- uses: ./.github/actions/download-locales
- run: pnpm build api
- run: ucacher pnpm build api
- run: pnpm build docs
env:
NODE_OPTIONS: --max-old-space-size=4096
Expand All @@ -144,9 +153,8 @@ jobs:

publish-docs:
needs: [lint, test-unit, build-docs]
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
environment: Production
if: github.event_name == 'push' && github.repository_owner == 'vuetifyjs' && github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand Down
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
2 changes: 1 addition & 1 deletion .github/workflows/crowdin-uploads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:

jobs:
upload-to-crowdin:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
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
12 changes: 3 additions & 9 deletions .github/workflows/nightly-schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
strategy:
max-parallel: 1
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:

percy:
name: Visual regression tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.repository_owner == 'vuetifyjs' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -66,16 +66,10 @@ jobs:
fi
- uses: vuetifyjs/setup-action@master
- run: echo "COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV
- run: pnpm cy:run
- run: pnpm test:percy
working-directory: ./packages/vuetify
env:
PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }}
PERCY_BRANCH: master
PERCY_TARGET_BRANCH: master
PERCY_COMMIT: ${{ env.COMMIT }}
- uses: actions/upload-artifact@v3
if: failure()
with:
name: cypress-screenshots
path: ./packages/vuetify/cypress/screenshots/
if-no-files-found: ignore
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
stale:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/stale@v9
with:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ on:

jobs:
triage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: vuetifyjs/triage-action@master
with:
token: ${{ secrets.GITHUB_TOKEN }}
triageLabel: 'S: triage'
staleLabel: 'S: stale'
sponsorsFile: '.github/sponsors.yml'
duplicateLabel: 'duplicate'
triagedLabels: |-
Expand Down
5 changes: 5 additions & 0 deletions .ucacherignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.git/**/*
node_modules/**/*
/tmp/**/*
.github/workflows/**/*
package.json
52 changes: 52 additions & 0 deletions .ucacherignore.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
ACTIONS_RUNTIME_TOKEN
GITHUB_ACTION
GITHUB_ACTION_PATH
GITHUB_ACTION_REF
GITHUB_ACTOR
GITHUB_ACTOR_ID
GITHUB_API_URL
GITHUB_BASE_REF
GITHUB_ENV
GITHUB_EVENT_NAME
GITHUB_EVENT_PATH
GITHUB_GRAPHQL_URL
GITHUB_HEAD_REF
GITHUB_JOB
GITHUB_OUTPUT
GITHUB_PATH
GITHUB_REF
GITHUB_REF_NAME
GITHUB_REF_PROTECTED
GITHUB_REF_TYPE
GITHUB_RETENTION_DAYS
GITHUB_RUN_ATTEMPT
GITHUB_RUN_ID
GITHUB_RUN_NUMBER
GITHUB_SERVER_URL
GITHUB_SHA
GITHUB_STATE
GITHUB_STEP_SUMMARY
GITHUB_TOKEN
GITHUB_TRIGGERING_ACTOR
GITHUB_WORKFLOW
GITHUB_WORKFLOW_REF
GITHUB_WORKFLOW_SHA
GITHUB_WORKSPACE
HOSTNAME
INVOCATION_ID
JOURNAL_STREAM
LOG_LEVEL
LS_COLORS
RUNNER_DEBUG
RUNNER_ENVIRONMENT
RUNNER_NAME
RUNNER_TEMP
RUNNER_TOOL_CACHE
RUNNER_TRACKING_ID
SSH_CLIENT
SSH_CONNECTION
STATS_BLT
STATS_EXTP
SYSTEMD_EXEC_PID
VITE_GITHUB_SHA
XDG_SESSION_ID
62 changes: 38 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://www.teamwork.com/" target="_blank">
<img height="35px" src="https://cdn.cosmicjs.com/ca146a20-bc5d-11ee-9be1-85f53db06a1d-teamwork-logo-2023.svg">
<a href="https://www.deepcloud.swiss/" target="_blank">
<img height="65px" src="https://cdn.cosmicjs.com/20504e40-6cbc-11ef-b5ae-a594bb4a8e67-deepcloud-light.svg">
</a>
</td>
</tr>
Expand All @@ -75,8 +75,18 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://github.com/sponsors/johnleider" target="_blank">
Your Logo Here
<a href="https://route4me.com/">
<img height="40px" src="https://cdn.cosmicjs.com/3b7a95b0-5360-11ef-b1ea-f56c65dfade9-route-4-me-light.png">
</a>
</td>
<td>
<a href="https://www.abacus.ch/">
<img height="40px" src="https://cdn.cosmicjs.com/0b978be0-6cbb-11ef-b5ae-a594bb4a8e67-abacus-light.svg">
</a>
</td>
<td>
<a href="https://www.hoop.swiss/">
<img height="40px" src="https://cdn.cosmicjs.com/94012850-6cbc-11ef-b5ae-a594bb4a8e67-hoop-light.svg">
</a>
</td>
</tr>
Expand All @@ -89,59 +99,63 @@ Funds donated through GitHub Sponsors and Patreon go directly to support John an
<tbody>
<tr>
<td>
<a href="https://careers.lmax.com/?utm_source=vuetify&utm_medium=github-link&utm_campaign=lmax-careers">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/lmax-exchange.png">
<a href="http://crossword-solver.io/">
<img height="35px" src="https://cdn.cosmicjs.com/098aa4e0-9749-11eb-bf6a-1ffd0f06b0f7-crossword-solver-logo-light.svg">
</a>
</td>
<td>
<a href="http://intygrate.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/intygrate.png">
<td style="text-align: center;">
<a href="https://www.muenchen.de/">
<img height="30px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.png">
</a>
</td>
<td>
<a href="http://vuemastery.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/vuemastery.svg">
<a href="https://careers.lmax.com/?utm_source=vuetify&utm_medium=github-link&utm_campaign=lmax-careers">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/lmax-exchange.png">
</a>
</td>
<td>
<a href="http://crossword-solver.io/">
<img height="35px" src="https://cdn.cosmicjs.com/098aa4e0-9749-11eb-bf6a-1ffd0f06b0f7-crossword-solver-logo-light.svg">
<a href="http://vuemastery.com/?ref=vuetify-github">
<img height="30px" src="https://cdn.vuetifyjs.com/images/backers/vuemastery.svg">
</a>
</td>
</tr>
<tr></tr>
<tr>
<td>
<a href="https://www.slim.ai/">
<img height="30px" src="https://cdn.cosmicjs.com/e7d53ff0-4ca5-11ec-9940-53a088b36636-slim-ai.svg">
<a href="https://views4you.com/buy-instagram-followers/">
<img height="30px" src="https://cdn.cosmicjs.com/861b0ce0-50e4-11ef-b1ea-f56c65dfade9-views-4-you-light.png">
</a>
</td>
<td>
<a href="https://crosswordanswers911.net/">
<img height="30px" src="https://cdn.cosmicjs.com/ef6ea2a0-7ee1-11ed-8730-d9eebcd39d9f-crossword-answers-911.jpg">
<a href="https://uk.nongamstopcasinos.net/">
<img height="30px" src="https://cdn.cosmicjs.com/dddf2570-6925-11ef-a492-5bdc7520fe60-logo_dark-bg.png.webp">
</a>
</td>
<td style="text-align: center;">
<a href="https://www.muenchen.de/">
<img height="40px" src="https://imgix.cosmicjs.com/af2ce530-eaa2-11ed-ba82-019c4666da06-itm-logo.png">
<a href="https://poprey.com/buy-instagram-followers">
<img height="30px" src="https://cdn.cosmicjs.com/69ea08d0-7b20-11ef-915f-61acd7484848-256-1.png">
</a>
</td>
<td>
<a href="https://justanotherpanel.com/">
<img height="30px" src="https://cdn.cosmicjs.com/8d038320-6382-11ee-b975-cb0cfadd93ad-jap.png">
<a href="https://www.mediamister.com/">
<img height="30px" src="https://cdn.cosmicjs.com/750cbe80-8d34-11ef-b5a0-93db72e2be98-logo-1.svg">
</a>
</td>
</tr>
<tr></tr>
<tr>
<td style="text-align: center;">
<a href="https://www.slotozilla.com/">
<img height="30px" src="https://cdn.cosmicjs.com/21525470-ab03-11ef-bee4-3bb1d3c55332-256-2.png">
</a>
</td>
<td>
<a href="https://stormlikes.net/">
<img height="40px" src="https://cdn.cosmicjs.com/64e6f630-a980-11ee-b417-db331415685f-stormlikes.png">
<a href="https://word.tips/">
<img height="30px" src="https://cdn.cosmicjs.com/5b16bd20-afab-11ef-bee4-3bb1d3c55332-wordtips-light.svg">
</a>
</td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
Expand Down
Loading

0 comments on commit a42281f

Please sign in to comment.