Skip to content

Commit

Permalink
Merge pull request #4705 from voxel51/release/v0.25.0
Browse files Browse the repository at this point in the history
Release/v0.25.0
  • Loading branch information
findtopher committed Aug 20, 2024
2 parents e3aa760 + 443172e commit dbd13b9
Show file tree
Hide file tree
Showing 655 changed files with 26,219 additions and 6,754 deletions.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
10 changes: 5 additions & 5 deletions .github/workflows/build-db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Clone fiftyone
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand Down Expand Up @@ -65,14 +65,14 @@ jobs:
cd package/db
python -Im build --sdist
- name: Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ matrix.platform == 'sdist' }}
with:
name: dist-${{ matrix.platform }}
path: package/db/dist/*.tar.gz
- name: Upload wheel
if: ${{ matrix.platform != 'sdist' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist-${{ matrix.platform }}
path: package/db/dist/*.whl
Expand All @@ -86,7 +86,7 @@ jobs:
- name: Clone fiftyone
uses: actions/checkout@v4
- name: Download fiftyone-db
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist-sdist
path: downloads
Expand All @@ -107,7 +107,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/db-v')
steps:
- name: Download
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: downloads
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
with:
submodules: true
- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install dependencies
run: |
pip install --upgrade pip setuptools wheel build
- name: Cache Node Modules
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
app/node_modules
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
working-directory: package/desktop
run: RELEASE_DIR=${PWD}/../../app/packages/desktop/release python -Im build -C="--build-option=--plat-name=${{ matrix.platform }}"
- name: Upload wheel
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheel-${{ matrix.platform }}
path: package/desktop/dist/*.whl
Expand All @@ -83,7 +83,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/desktop-v')
steps:
- name: Download wheels
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: downloads
- name: Install dependencies
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
token: ${{ secrets.TEAMS_GITHUB_PAT }}
ref: main
- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install pip dependencies
Expand All @@ -77,7 +77,7 @@ jobs:
pip install .
- name: Cache Node Modules
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
app/node_modules
Expand All @@ -90,7 +90,7 @@ jobs:
run: |
./docs/generate_docs.bash -t fiftyone-teams
- name: Upload docs
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docs
path: docs/build/html/
Expand All @@ -101,15 +101,15 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Download docs
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: docs
path: docs-download/
- name: Authorize gcloud
uses: google-github-actions/auth@v1
uses: google-github-actions/auth@v2
with:
credentials_json: "${{ secrets.DOCS_GCP_CREDENTIALS }}"
- name: Set up gcloud
uses: google-github-actions/setup-gcloud@v1
uses: google-github-actions/setup-gcloud@v2
- name: publish
run: gsutil -m rsync -dR docs-download gs://docs.voxel51.com
6 changes: 3 additions & 3 deletions .github/workflows/build-graphql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Clone fiftyone
uses: actions/checkout@v4
- name: Set up Python 3.9
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install dependencies
Expand All @@ -34,7 +34,7 @@ jobs:
cd package/graphql
python -Im build
- name: Upload wheel(s)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: package/graphql/dist/*
Expand All @@ -45,7 +45,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags/db-v')
steps:
- name: Download wheels
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: downloads
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
changes: ${{ steps.filter.outputs.changes }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand All @@ -27,15 +27,15 @@ jobs:
with:
submodules: true
- name: Set up Python 3.8
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install dependencies
run: |
pip install --upgrade pip setuptools wheel build
- name: Cache Node Modules
id: node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
app/node_modules
Expand All @@ -56,7 +56,7 @@ jobs:
- name: Build python
run: make python -o app
- name: Upload dist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: dist/
15 changes: 7 additions & 8 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
submodules: true

- name: Setup node 18
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18

- name: Start MongoDB
uses: supercharge/mongodb-github-action@1.10.0
uses: supercharge/mongodb-github-action@1.11.0
with:
mongodb-version: latest

Expand All @@ -42,7 +42,7 @@ jobs:
- name: Cache Node Modules
id: app-node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
app/node_modules
Expand All @@ -60,7 +60,6 @@ jobs:
- name: Install fiftyone
run: |
pip install .
pip install fiftyone-db-ubuntu2204
- name: Configure
id: test_config
Expand All @@ -69,11 +68,11 @@ jobs:
python tests/utils/github_actions_flags.py
- name: FFmpeg
uses: FedericoCarboni/setup-ffmpeg@v2
uses: FedericoCarboni/setup-ffmpeg@v3

- name: Cache E2E Node Modules
id: e2e-node-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
e2e-pw/node_modules
Expand All @@ -91,7 +90,7 @@ jobs:
working-directory: e2e-pw

- name: Cache playwright browser
uses: actions/cache@v3
uses: actions/cache@v4
id: playwright-browser-cache
with:
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
Expand All @@ -113,7 +112,7 @@ jobs:

- name: Upload test report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: playwright-report
path: e2e-pw/playwright-report/
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/lint-app.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Lint App

on: workflow_call

jobs:
eslint:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- uses: actions/checkout@v4
- uses: dorny/paths-filter@v3
id: changes
with:
filters: |
changes:
- 'app/**'
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: "16"

- name: Cache Node Modules
id: node-cache
uses: actions/cache@v4
with:
path: |
app/node_modules
app/.yarn/cache
key: node-modules-${{ hashFiles('app/yarn.lock') }}

- name: Install Dependencies
if: steps.node-cache.outputs.cache-hit != 'true'
run: cd app && yarn install

- name: Lint ESLint packages
run: |
cd app
ESLINT_PACKAGES=$(grep -v '^#' ./eslint-packages.txt | xargs)
yarn eslint $ESLINT_PACKAGES
- name: Lint Biome Packages
run: |
cd app
yarn check
21 changes: 16 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ jobs:
e2e:
uses: ./.github/workflows/e2e.yml

lint:
uses: ./.github/workflows/lint-app.yml

teams:
runs-on: ubuntu-latest
if: github.base_ref == 'develop'
if: false && github.base_ref == 'develop' # temporarily disabled
steps:
- uses: convictional/trigger-workflow-and-wait@v1.6.1
- uses: convictional/trigger-workflow-and-wait@v1.6.5
with:
owner: voxel51
repo: fiftyone-teams
Expand All @@ -29,7 +32,12 @@ jobs:
workflow_file_name: merge-oss.yml
ref: develop
wait_interval: 20
client_payload: '{ "branch": "${{ github.head_ref || github.ref_name }}" }'
client_payload: |
{
"author": "${{ github.event.pull_request.user.login }}",
"branch": "${{ github.head_ref || github.ref_name }}",
"pr": ${{ github.event.pull_request.number }}
}
propagate_failure: true
trigger_workflow: true
wait_workflow: true
Expand All @@ -39,7 +47,10 @@ jobs:

all-tests:
runs-on: ubuntu-latest
needs: [build, test]
needs: [build, lint, test]
if: always()
steps:
- run: sh -c ${{ needs.build.result == 'success' && needs.test.result == 'success' }}
- run: sh -c ${{
needs.build.result == 'success' &&
needs.lint.result == 'success' &&
needs.test.result == 'success' }}
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
needs: [build, test]
steps:
- name: Download dist
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist/
Expand All @@ -48,14 +48,14 @@ jobs:
- name: Clone fiftyone
uses: actions/checkout@v4
- name: Download dist
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
- name: docker
run: make docker-export -o python
- name: Upload image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-image
path: fiftyone.tar.gz
1 change: 0 additions & 1 deletion .github/workflows/push-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Push Release
on:
push:
branches:
- main
- release/v[0-9]+.[0-9]+.[0-9]+
workflow_dispatch:
inputs:
Expand Down
Loading

0 comments on commit dbd13b9

Please sign in to comment.