-
Notifications
You must be signed in to change notification settings - Fork 167
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into activity-creation
- Loading branch information
Showing
192 changed files
with
25,181 additions
and
20,772 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| name: pre-commit | ||
| on: | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| pre-commit: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Set up Docker Buildx | ||
| uses: docker/setup-buildx-action@v3 | ||
|
|
||
| - name: Set up Docker Compose | ||
| run: | | ||
| sudo curl -L "https://github.com/docker/compose/releases/download/v2.23.3/docker-compose-$(uname -s)-$(uname -m)" \ | ||
| -o /usr/local/bin/docker-compose | ||
| sudo chmod +x /usr/local/bin/docker-compose | ||
| - name: Get number of PR commits + 1 | ||
| run: echo "PR_FETCH_DEPTH=$(( ${{ github.event.pull_request.commits }} + 1 ))" >> $GITHUB_ENV | ||
|
|
||
| - uses: unstructuredstudio/zubhub/.github/actions/checkout@master | ||
| with: | ||
| ref: ${{ github.head_ref }} | ||
| fetch_depth: ${{ env.PR_FETCH_DEPTH }} | ||
|
|
||
| - name: Undo all PR commits and keep changes in staging area | ||
| run: | | ||
| # some of our pre-commit hooks uses `git diff --name-only --cached` to get the list | ||
| # changed files. This step undos the most recent commits in the checkout, | ||
| # leaving the changes in the staging area for our `git diff ..` to find. | ||
| git reset --soft HEAD~$(( ${{ env.PR_FETCH_DEPTH }} - 1 )) | ||
| - run: | | ||
| # Running pre-commit on the following files: | ||
| target_files=$(git diff --name-only --cached) | ||
| echo "Running pre-commit on the following files:" | ||
| echo "$target_files" | ||
| - uses: actions/setup-python@v3 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: 16 | ||
| cache: 'npm' | ||
| cache-dependency-path: zubhub_frontend/zubhub/package-lock.json | ||
|
|
||
| - run: npm ci --prefix ./zubhub_frontend/zubhub/ | ||
|
|
||
| - uses: pre-commit/action@v3.0.0 | ||
| id: pre_commit | ||
| with: | ||
| # by default pre-commit/action runs `pre-commit run --all-files ...`. | ||
| # Here we use empty extra_args to force it to run `pre-commit run ...` instead. | ||
| # this is important because we want it to only run on the files that have changed | ||
| extra_args: | ||
| continue-on-error: true | ||
|
|
||
| - name: Success comment | ||
| if: steps.pre_commit.outcome == 'success' | ||
| uses: unstructuredstudio/zubhub/.github/actions/comment_action@master | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| issue_number: ${{ github.event.pull_request.number }} | ||
| owner: ${{ github.repository_owner }} | ||
| repo: ${{ github.event.repository.name }} | ||
| message: | | ||
| All pre-commit checks passed ✅✅✅ | ||
| - name: Failure comment | ||
| if: steps.pre_commit.outcome != 'success' | ||
| uses: unstructuredstudio/zubhub/.github/actions/comment_action@master | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| issue_number: ${{ github.event.pull_request.number }} | ||
| owner: ${{ github.repository_owner }} | ||
| repo: ${{ github.event.repository.name }} | ||
| message: | | ||
| pre-commit checks failed ❌❌❌ | ||
| make sure you have pre-commit set up locally (see the README.md for instructions). | ||
| If you have set up pre-commit locally, you may need to undo this commit and | ||
| run "pre-commit" locally to see what the errors are. | ||
| - name: Failure exit | ||
| if: steps.pre_commit.outcome != 'success' | ||
| run: exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| default_language_version: | ||
| python: python3 | ||
|
|
||
| repos: | ||
| - repo: https://github.com/psf/black | ||
| rev: 23.1.0 | ||
| hooks: | ||
| - id: black | ||
| args: ["-l 88"] | ||
| files: zubhub_backend/.*\.py$ | ||
|
|
||
| - repo: https://github.com/PyCQA/isort | ||
| rev: 5.11.5 # do not update this until our CI runner uses Python >=3.8.1 | ||
| hooks: | ||
| - id: isort | ||
| files: zubhub_backend/.*\.py$ | ||
|
|
||
| - repo: https://github.com/PyCQA/flake8 | ||
| rev: 5.0.4 # do not update this until our CI runner uses Python >=3.8.1 | ||
| hooks: | ||
| - id: flake8 | ||
| # use same max-line-length as black | ||
| # E121, E123, E126, E133, E226, E241, E242, E704 and W503 are default ignores | ||
| # E124: closing bracket does not match visual indentation | ||
| # E203: non-pep8 compliant brainfart of flake8 | ||
| args: | ||
| [ | ||
| "--max-line-length=88", | ||
| "--ignore=E121,E123,E126,E133,E203,E226,E241,E242,E704,W503,E124", | ||
| ] | ||
| files: zubhub_backend/.*\.py$ | ||
|
|
||
| # - repo: https://github.com/pre-commit/mirrors-mypy | ||
| # rev: v1.0.0 | ||
| # hooks: | ||
| # - id: mypy | ||
| # exclude: ^tests/ | ||
| # verbose: true | ||
| # args: [--show-error-codes, --ignore-missing-imports] | ||
| # additional_dependencies: | ||
| # ["types-requests", "types-PyYAML", "types-flask", "toolforge-weld"] | ||
|
|
||
| - repo: https://github.com/pre-commit/pre-commit-hooks | ||
| rev: v4.4.0 | ||
| hooks: | ||
| - id: trailing-whitespace | ||
| - id: end-of-file-fixer | ||
| - id: check-yaml | ||
| - id: check-shebang-scripts-are-executable | ||
| - id: check-executables-have-shebangs | ||
| - id: check-merge-conflict | ||
|
|
||
| - repo: https://github.com/pre-commit/mirrors-eslint | ||
| rev: v7.32.0 | ||
| hooks: | ||
| - id: eslint | ||
| entry: ./zubhub_frontend/zubhub/pre-commit-eslint | ||
| pass_filenames: false | ||
| always_run: true | ||
|
|
||
| - repo: https://github.com/pre-commit/mirrors-prettier | ||
| rev: v3.1.0 | ||
| hooks: | ||
| - id: prettier | ||
| files: zubhub_frontend/.*\.[jt]sx?$ | ||
| exclude: ^zubhub_frontend/zubhub/node_modules/ | ||
| args: ["--config", "./zubhub_frontend/zubhub/.prettierrc.yaml"] | ||
|
|
||
| - repo: local | ||
| hooks: | ||
| - id: zubhub-test | ||
| name: zubhub-test | ||
| entry: ./zubhub_backend/pre-commit-zubhub-test | ||
| language: system | ||
| files: zubhub_backend/zubhub/.*\.py$ | ||
| pass_filenames: false | ||
|
|
||
| - id: media-test | ||
| name: media-test | ||
| entry: ./zubhub_backend/pre-commit-media-test | ||
| language: system | ||
| files: zubhub_backend/media/.*\.py$ | ||
| pass_filenames: false | ||
|
|
||
| - id: react-test | ||
| name: react-test | ||
| entry: npm --prefix ./zubhub_frontend/zubhub/ run test -- --coverage --watchAll=false | ||
| language: node | ||
| files: zubhub_frontend/.*\.[jt]sx?$ | ||
| exclude: ^zubhub_frontend/zubhub/node_modules/ | ||
| pass_filenames: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.