Skip to content

Commit

Permalink
No need to bump version twice.
Browse files Browse the repository at this point in the history
  • Loading branch information
ptr727 committed Apr 13, 2024
1 parent 0910552 commit 81ffc65
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/BuildDockerPush.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ jobs:
file: debian.ver
# - tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'alpine' || 'alpine-develop' }}
# file: alpine.ver
- tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'alpine-edge' || 'alpine-edge-develop' }}
file: alpine-edge.ver
# - tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'alpine-edge' || 'alpine-edge-develop' }}
# file: alpine-edge.ver
- tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'savoury' || 'savoury-develop' }}
file: savoury.ver
- tag: ${{ endsWith(github.ref, 'refs/heads/main') && 'arch' || 'arch-develop' }}
Expand Down
10 changes: 2 additions & 8 deletions Docker/README.m4
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ Images are updated weekly with the latest upstream updates.
- Media processing tools are installed from the standard repositories.
- Multi-architecture image supporting `linux/amd64`, and `linux/arm64`.
- There is currently no `linux/arm/v7` package for [HandBrake](https://pkgs.alpinelinux.org/packages?name=handbrake&branch=edge&repo=&arch=&maintainer=).
- `alpine-edge`: Builds using [Alpine Edge](https://hub.docker.com/_/alpine/) as base image.
- Media processing tools are installed from the standard repositories.
- Multi-architecture image supporting `linux/amd64`, and `linux/arm64`.
- There is currently no `linux/arm/v7` package for [HandBrake](https://pkgs.alpinelinux.org/packages?name=handbrake&branch=edge&repo=&arch=&maintainer=).
- `debian`: Builds using [Microsoft .NET pre-installed on Debian](https://hub.docker.com/_/microsoft-dotnet-sdk/) as base image.
- Media processing tools are installed from the standard repositories.
- Multi-architecture image supporting `linux/amd64`, `linux/arm64`, and `linux/arm/v7` builds.
Expand Down Expand Up @@ -72,11 +68,9 @@ include({{savoury.ver}})
include({{debian.ver}})
```

### `ptr727/plexcleaner:alpine-edge`
### `ptr727/plexcleaner:alpine`

```text
include({{alpine-edge.ver}})
```
*Alpine is [not](https://github.com/ptr727/PlexCleaner/issues/344) currently being built.*

### `ptr727/plexcleaner:arch`

Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ Docker images are published on [Docker Hub][docker-link].

## Release Notes

- Version 3.8:
- Disabling Alpine Edge builds, Handbrake is [failing](https://gitlab.alpinelinux.org/alpine/aports/-/issues/15979) to install, again.
- Will re-enable alpine builds if Alpine 3.20 and Handbrake is stable.
- Version 3.7:
- Added `ProcessOptions:IgnoreFiles` to support skipping (not deleting) sample files per [discussions request](https://github.com/ptr727/PlexCleaner/discussions/341).
- Wildcard characters `*` and `?` are supported, e.g. `*.sample` or `*.sample.*`.
Expand All @@ -46,6 +43,8 @@ Docker images are published on [Docker Hub][docker-link].
- Changed JSON serialization from `Newtonsoft.Json` [to](https://learn.microsoft.com/en-us/dotnet/standard/serialization/system-text-json/migrate-from-newtonsoft) .NET native `Text.Json`.
- Changed JSON schema generation from `Newtonsoft.Json.Schema` [to][jsonschema-link] `JsonSchema.Net.Generation`.
- Fixed issue with old settings schemas not upgrading as expected, and updated associated unit tests to help catch this next time.
- Disabling Alpine Edge builds, Handbrake is [failing](https://gitlab.alpinelinux.org/alpine/aports/-/issues/15979) to install, again.
- Will re-enable Alpine builds if Alpine 3.20 and Handbrake is stable.
- Version 3.6:
- Disabling Alpine 3.19 release builds and switching to Alpine Edge.
- Handbrake is only available on Edge, and mixing released and Edge versions cause too many [issues](https://gitlab.alpinelinux.org/alpine/aports/-/issues/15949).
Expand Down
2 changes: 1 addition & 1 deletion version.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "3.8",
"version": "3.7",
"publicReleaseRefSpec": [
"^refs/heads/main$"
],
Expand Down

0 comments on commit 81ffc65

Please sign in to comment.