Skip to content

Migrate to main branch development - #419

Merged
Breakthrough merged 14 commits into
mainfrom
develop
Sep 8, 2024
Merged

Breakthrough merged 14 commits into
mainfrom
develop

Conversation

@Breakthrough

Copy link
Copy Markdown
Owner

Having a separate develop branch complicates some workflows, so I'm migrating the project such that we continually develop directly in main. This avoids needing us to ask people to re-base their PRs ontop of develop to reduce friction in first time contributors.

The other change is on the docs, scenedetect.com/docs/develop won't make sense anymore. I'll rename that to scenedetect.com/docs/head to be branch name agnostic and indicate that it's at the HEAD commit of development.

Breakthrough and others added 14 commits June 11, 2024 21:29
* Bump jinja2 from 3.1.3 to 3.1.4 in /website (#397)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.3...3.1.4)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [dist] Fix Github license detection.

* [dist] Use Github license template. Fixes #365.

* [docs] Add CITATION.cff #399

* [dist] Prepare for v0.6.4 release.

* [build] Auto-generate .version_info and verify installer version.

* [build] Add missing pre-release script invocation for Windows build on Github.

* [build] Fix incorrect path to pre_release script.

* [build] Omit unnecessary files in distributed docs.

* [dist] Update Windows installer for v0.6.4.

Bump OpenCV to 4.10.

* [build] Use specific OpenCV version for Windows build.

* [dist] Release v0.6.4.

* [docs] Update changelog and image URI.

* add detect-hash and detect-hist as options for default-detector

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Breakthrough <brandon248@gmail.com>
Now passes `ruff check` with some fixes suppressed.
* [project] Enable more lint rules.

* Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows in the github_actions group across 1 directory (#417)

Bump actions/download-artifact

Bumps the github_actions group with 1 update in the /.github/workflows directory: [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `actions/download-artifact` from 3 to 4.1.7
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  dependency-group: github_actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [build] Fix incorrect version conversion for Pyinstaller build

* [build] Update workflow actions.

* [build] Update workflow actions.

* Revert "[build] Update workflow actions."

Mistaken merge commit. This reverts commit c23eee8.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Breakthrough
Breakthrough merged commit 0f2eddf into main Sep 8, 2024
@Breakthrough
Breakthrough deleted the develop branch September 8, 2024 01:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants