chore: Refactor git/dev workflow to use master as unstable branch

* Aligns with "normal" default branch usage better, allows dependabot to actually run
* Change image publishing to push tagged images as 'latest' and master images as `edge`
This commit is contained in:
FoxxMD 2024-08-30 09:53:52 -04:00
parent 90c481b12b
commit 0feb02babe
8 changed files with 11 additions and 15 deletions

View file

@ -32,7 +32,7 @@ Copy and paste as much log data as possible related to this issue here.
**Versions (please complete the following information):**
Provide version information for any related sources/clients.
- multi-scrobbler: [e.g. 0.4.0 on docker]
- multi-scrobbler: [e.g. 0.8.3 on docker]
- maloja [e.g. 3.1.4]
- jellyfin [e.g. 10.8.9]

View file

@ -1,4 +1,4 @@
{
"ref": "refs/heads/master",
"sha": "0a1a94d9ad4efa373f8d34aace5e7f0a3fff42ad"
"sha": "e80ad81f051e2ff29e73c0401ad9b89a1b32c3f7"
}

View file

@ -4,7 +4,6 @@ on:
push:
branches:
- 'master'
- 'develop'
tags:
- '*.*.*'
# don't trigger if just updating docs

View file

@ -1,6 +1,5 @@
## Checklist before requesting a review
- [ ] **I am opening this PR for the [`develop` branch](https://github.com/FoxxMD/multi-scrobbler/tree/develop) and NOT `master`.**
- [ ] I have read the [contributing guidelines.](../CONTRIBUTING.md)
## Type of change

View file

@ -2,10 +2,8 @@ name: Deploy to GitHub Pages
on:
workflow_dispatch:
push:
branches:
- master
- developDocs
release:
types: [released]
# Review gh actions docs if you want to further define triggers, paths, etc
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#on

View file

@ -8,7 +8,7 @@ on:
- reopened
- opened
branches:
- 'develop'
- 'master'
jobs:
test:

View file

@ -5,7 +5,6 @@ on:
push:
branches:
- 'master'
- 'develop'
tags:
- '*.*.*'
# don't trigger if just updating docs
@ -95,11 +94,13 @@ jobs:
# generate Docker tags based on the following events/attributes
# https://github.com/docker/metadata-action/issues/247#issuecomment-1511259674 for NOT is default branch, eventually
tags: |
type=raw,value=latest,enable={{is_default_branch}},suffix=${{ matrix.suffix }}
type=ref,event=branch,enable=${{ !endsWith(github.ref, 'master') }},suffix=${{ matrix.suffix }}
type=semver,pattern={{version}},suffix=${{ matrix.suffix }}
type=raw,value=edge,enable={{is_default_branch}}
type=ref,event=branch,enable=${{ !endsWith(github.ref, 'master') }}
type=semver,pattern={{version}}
type=semver,value=latest
flavor: |
latest=false
suffix=${{ matrix.suffix }},onlatest=true
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

View file

@ -2,7 +2,6 @@
Please follow these guidelines when contributing code to this repository:
* The PR **must be for the [`develop` branch.](https://github.com/FoxxMD/multi-scrobbler/tree/develop)** The `master` branch is for releases only.
* Use [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/#summary) format when creating commits.
* Preferably, please use a [feature branch](https://stackoverflow.com/a/39586780/1469797) instead of committing directly to `develop`.
* Preferably, please use a [feature branch](https://stackoverflow.com/a/39586780/1469797) instead of committing directly to `master`.
* Ensure that if your code is covered by [an existing test](./src/backend/tests) that you have updated the test accordingly