Skip to content

Commit dbd13b9

Browse files
authored
Merge pull request #4705 from voxel51/release/v0.25.0
Release/v0.25.0
2 parents e3aa760 + 443172e commit dbd13b9

File tree

655 files changed

+26219
-6754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

655 files changed

+26219
-6754
lines changed

.github/dependabot.yml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"

.github/workflows/build-db.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Clone fiftyone
2727
uses: actions/checkout@v4
2828
- name: Set up Python 3.9
29-
uses: actions/setup-python@v4
29+
uses: actions/setup-python@v5
3030
with:
3131
python-version: 3.9
3232
- name: Install dependencies
@@ -65,14 +65,14 @@ jobs:
6565
cd package/db
6666
python -Im build --sdist
6767
- name: Upload
68-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@v4
6969
if: ${{ matrix.platform == 'sdist' }}
7070
with:
7171
name: dist-${{ matrix.platform }}
7272
path: package/db/dist/*.tar.gz
7373
- name: Upload wheel
7474
if: ${{ matrix.platform != 'sdist' }}
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: dist-${{ matrix.platform }}
7878
path: package/db/dist/*.whl
@@ -86,7 +86,7 @@ jobs:
8686
- name: Clone fiftyone
8787
uses: actions/checkout@v4
8888
- name: Download fiftyone-db
89-
uses: actions/download-artifact@v3
89+
uses: actions/download-artifact@v4
9090
with:
9191
name: dist-sdist
9292
path: downloads
@@ -107,7 +107,7 @@ jobs:
107107
if: startsWith(github.ref, 'refs/tags/db-v')
108108
steps:
109109
- name: Download
110-
uses: actions/download-artifact@v3
110+
uses: actions/download-artifact@v4
111111
with:
112112
path: downloads
113113
- name: Install dependencies

.github/workflows/build-desktop.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
with:
2929
submodules: true
3030
- name: Set up Python 3.8
31-
uses: actions/setup-python@v4
31+
uses: actions/setup-python@v5
3232
with:
3333
python-version: 3.8
3434
- name: Install dependencies
3535
run: |
3636
pip install --upgrade pip setuptools wheel build
3737
- name: Cache Node Modules
3838
id: node-cache
39-
uses: actions/cache@v3
39+
uses: actions/cache@v4
4040
with:
4141
path: |
4242
app/node_modules
@@ -72,7 +72,7 @@ jobs:
7272
working-directory: package/desktop
7373
run: RELEASE_DIR=${PWD}/../../app/packages/desktop/release python -Im build -C="--build-option=--plat-name=${{ matrix.platform }}"
7474
- name: Upload wheel
75-
uses: actions/upload-artifact@v3
75+
uses: actions/upload-artifact@v4
7676
with:
7777
name: wheel-${{ matrix.platform }}
7878
path: package/desktop/dist/*.whl
@@ -83,7 +83,7 @@ jobs:
8383
if: startsWith(github.ref, 'refs/tags/desktop-v')
8484
steps:
8585
- name: Download wheels
86-
uses: actions/download-artifact@v3
86+
uses: actions/download-artifact@v4
8787
with:
8888
path: downloads
8989
- name: Install dependencies

.github/workflows/build-docs.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
token: ${{ secrets.TEAMS_GITHUB_PAT }}
5555
ref: main
5656
- name: Set up Python 3.8
57-
uses: actions/setup-python@v4
57+
uses: actions/setup-python@v5
5858
with:
5959
python-version: 3.8
6060
- name: Install pip dependencies
@@ -77,7 +77,7 @@ jobs:
7777
pip install .
7878
- name: Cache Node Modules
7979
id: node-cache
80-
uses: actions/cache@v3
80+
uses: actions/cache@v4
8181
with:
8282
path: |
8383
app/node_modules
@@ -90,7 +90,7 @@ jobs:
9090
run: |
9191
./docs/generate_docs.bash -t fiftyone-teams
9292
- name: Upload docs
93-
uses: actions/upload-artifact@v3
93+
uses: actions/upload-artifact@v4
9494
with:
9595
name: docs
9696
path: docs/build/html/
@@ -101,15 +101,15 @@ jobs:
101101
runs-on: ubuntu-20.04
102102
steps:
103103
- name: Download docs
104-
uses: actions/download-artifact@v3
104+
uses: actions/download-artifact@v4
105105
with:
106106
name: docs
107107
path: docs-download/
108108
- name: Authorize gcloud
109-
uses: google-github-actions/auth@v1
109+
uses: google-github-actions/auth@v2
110110
with:
111111
credentials_json: "${{ secrets.DOCS_GCP_CREDENTIALS }}"
112112
- name: Set up gcloud
113-
uses: google-github-actions/setup-gcloud@v1
113+
uses: google-github-actions/setup-gcloud@v2
114114
- name: publish
115115
run: gsutil -m rsync -dR docs-download gs://docs.voxel51.com

.github/workflows/build-graphql.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Clone fiftyone
1717
uses: actions/checkout@v4
1818
- name: Set up Python 3.9
19-
uses: actions/setup-python@v4
19+
uses: actions/setup-python@v5
2020
with:
2121
python-version: 3.9
2222
- name: Install dependencies
@@ -34,7 +34,7 @@ jobs:
3434
cd package/graphql
3535
python -Im build
3636
- name: Upload wheel(s)
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
3939
name: dist
4040
path: package/graphql/dist/*
@@ -45,7 +45,7 @@ jobs:
4545
if: startsWith(github.ref, 'refs/tags/db-v')
4646
steps:
4747
- name: Download wheels
48-
uses: actions/download-artifact@v3
48+
uses: actions/download-artifact@v4
4949
with:
5050
path: downloads
5151
- name: Install dependencies

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
changes: ${{ steps.filter.outputs.changes }}
1010
steps:
1111
- uses: actions/checkout@v4
12-
- uses: dorny/paths-filter@v2
12+
- uses: dorny/paths-filter@v3
1313
id: filter
1414
with:
1515
filters: |
@@ -27,15 +27,15 @@ jobs:
2727
with:
2828
submodules: true
2929
- name: Set up Python 3.8
30-
uses: actions/setup-python@v4
30+
uses: actions/setup-python@v5
3131
with:
3232
python-version: 3.8
3333
- name: Install dependencies
3434
run: |
3535
pip install --upgrade pip setuptools wheel build
3636
- name: Cache Node Modules
3737
id: node-cache
38-
uses: actions/cache@v3
38+
uses: actions/cache@v4
3939
with:
4040
path: |
4141
app/node_modules
@@ -56,7 +56,7 @@ jobs:
5656
- name: Build python
5757
run: make python -o app
5858
- name: Upload dist
59-
uses: actions/upload-artifact@v3
59+
uses: actions/upload-artifact@v4
6060
with:
6161
name: dist
6262
path: dist/

.github/workflows/e2e.yml

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
submodules: true
2424

2525
- name: Setup node 18
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: 18
2929

3030
- name: Start MongoDB
31-
uses: supercharge/mongodb-github-action@1.10.0
31+
uses: supercharge/mongodb-github-action@1.11.0
3232
with:
3333
mongodb-version: latest
3434

@@ -42,7 +42,7 @@ jobs:
4242
4343
- name: Cache Node Modules
4444
id: app-node-cache
45-
uses: actions/cache@v3
45+
uses: actions/cache@v4
4646
with:
4747
path: |
4848
app/node_modules
@@ -60,7 +60,6 @@ jobs:
6060
- name: Install fiftyone
6161
run: |
6262
pip install .
63-
pip install fiftyone-db-ubuntu2204
6463
6564
- name: Configure
6665
id: test_config
@@ -69,11 +68,11 @@ jobs:
6968
python tests/utils/github_actions_flags.py
7069
7170
- name: FFmpeg
72-
uses: FedericoCarboni/setup-ffmpeg@v2
71+
uses: FedericoCarboni/setup-ffmpeg@v3
7372

7473
- name: Cache E2E Node Modules
7574
id: e2e-node-cache
76-
uses: actions/cache@v3
75+
uses: actions/cache@v4
7776
with:
7877
path: |
7978
e2e-pw/node_modules
@@ -91,7 +90,7 @@ jobs:
9190
working-directory: e2e-pw
9291

9392
- name: Cache playwright browser
94-
uses: actions/cache@v3
93+
uses: actions/cache@v4
9594
id: playwright-browser-cache
9695
with:
9796
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
@@ -113,7 +112,7 @@ jobs:
113112

114113
- name: Upload test report
115114
if: always()
116-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v4
117116
with:
118117
name: playwright-report
119118
path: e2e-pw/playwright-report/

.github/workflows/lint-app.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Lint App
2+
3+
on: workflow_call
4+
5+
jobs:
6+
eslint:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout repository
10+
uses: actions/checkout@v4
11+
12+
- uses: actions/checkout@v4
13+
- uses: dorny/paths-filter@v3
14+
id: changes
15+
with:
16+
filters: |
17+
changes:
18+
- 'app/**'
19+
20+
- name: Set up Node.js
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: "16"
24+
25+
- name: Cache Node Modules
26+
id: node-cache
27+
uses: actions/cache@v4
28+
with:
29+
path: |
30+
app/node_modules
31+
app/.yarn/cache
32+
key: node-modules-${{ hashFiles('app/yarn.lock') }}
33+
34+
- name: Install Dependencies
35+
if: steps.node-cache.outputs.cache-hit != 'true'
36+
run: cd app && yarn install
37+
38+
- name: Lint ESLint packages
39+
run: |
40+
cd app
41+
ESLINT_PACKAGES=$(grep -v '^#' ./eslint-packages.txt | xargs)
42+
yarn eslint $ESLINT_PACKAGES
43+
44+
- name: Lint Biome Packages
45+
run: |
46+
cd app
47+
yarn check

.github/workflows/pr.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ jobs:
1616
e2e:
1717
uses: ./.github/workflows/e2e.yml
1818

19+
lint:
20+
uses: ./.github/workflows/lint-app.yml
21+
1922
teams:
2023
runs-on: ubuntu-latest
21-
if: github.base_ref == 'develop'
24+
if: false && github.base_ref == 'develop' # temporarily disabled
2225
steps:
23-
- uses: convictional/[email protected].1
26+
- uses: convictional/[email protected].5
2427
with:
2528
owner: voxel51
2629
repo: fiftyone-teams
@@ -29,7 +32,12 @@ jobs:
2932
workflow_file_name: merge-oss.yml
3033
ref: develop
3134
wait_interval: 20
32-
client_payload: '{ "branch": "${{ github.head_ref || github.ref_name }}" }'
35+
client_payload: |
36+
{
37+
"author": "${{ github.event.pull_request.user.login }}",
38+
"branch": "${{ github.head_ref || github.ref_name }}",
39+
"pr": ${{ github.event.pull_request.number }}
40+
}
3341
propagate_failure: true
3442
trigger_workflow: true
3543
wait_workflow: true
@@ -39,7 +47,10 @@ jobs:
3947

4048
all-tests:
4149
runs-on: ubuntu-latest
42-
needs: [build, test]
50+
needs: [build, lint, test]
4351
if: always()
4452
steps:
45-
- run: sh -c ${{ needs.build.result == 'success' && needs.test.result == 'success' }}
53+
- run: sh -c ${{
54+
needs.build.result == 'success' &&
55+
needs.lint.result == 'success' &&
56+
needs.test.result == 'success' }}

.github/workflows/publish.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
needs: [build, test]
2222
steps:
2323
- name: Download dist
24-
uses: actions/download-artifact@v3
24+
uses: actions/download-artifact@v4
2525
with:
2626
name: dist
2727
path: dist/
@@ -48,14 +48,14 @@ jobs:
4848
- name: Clone fiftyone
4949
uses: actions/checkout@v4
5050
- name: Download dist
51-
uses: actions/download-artifact@v3
51+
uses: actions/download-artifact@v4
5252
with:
5353
name: dist
5454
path: dist
5555
- name: docker
5656
run: make docker-export -o python
5757
- name: Upload image
58-
uses: actions/upload-artifact@v3
58+
uses: actions/upload-artifact@v4
5959
with:
6060
name: docker-image
6161
path: fiftyone.tar.gz

.github/workflows/push-release.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ name: Push Release
33
on:
44
push:
55
branches:
6-
- main
76
- release/v[0-9]+.[0-9]+.[0-9]+
87
workflow_dispatch:
98
inputs:

0 commit comments

Comments
 (0)