Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge main into dev #72

Merged
merged 25 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c1d4b92
Merge pull request #55 from everettsouthwick/develop
everettsouthwick Sep 23, 2023
3f1e7c0
chore(deps): update actions/checkout action to v4
renovate[bot] Sep 23, 2023
9b16e7b
Merge pull request #54 from everettsouthwick/renovate/actions-checkou…
everettsouthwick Sep 24, 2023
3d10c6f
chore(deps): update dependency plexapi to v4.15.3
renovate[bot] Sep 29, 2023
3e9d7ef
Merge pull request #56 from everettsouthwick/renovate/plexapi-4.x
everettsouthwick Sep 30, 2023
e6957bc
chore(deps): update dependency schedule to v1.2.1
renovate[bot] Oct 1, 2023
c45e33d
Merge pull request #57 from everettsouthwick/renovate/schedule-1.x
everettsouthwick Oct 1, 2023
32b0297
chore(deps): update dependency plexapi to v4.15.4
renovate[bot] Oct 4, 2023
9ba074e
Merge pull request #58 from everettsouthwick/renovate/plexapi-4.x
everettsouthwick Oct 5, 2023
6c2851b
Update docker-develop-publish.yml
everettsouthwick Oct 9, 2023
d69e46a
chore(deps): update docker/build-push-action action to v5
renovate[bot] Oct 9, 2023
9ee82c9
Update docker-latest-publish.yml
everettsouthwick Oct 9, 2023
266ee34
chore(deps): update docker/login-action action to v3
renovate[bot] Oct 9, 2023
966df51
Merge pull request #61 from everettsouthwick/renovate/docker-build-pu…
everettsouthwick Oct 9, 2023
e4ff60e
Merge pull request #62 from everettsouthwick/renovate/docker-login-ac…
everettsouthwick Oct 9, 2023
3a90afa
chore(deps): update docker/login-action action to v3
renovate[bot] Oct 9, 2023
9a57014
chore(deps): update docker/build-push-action action to v5
renovate[bot] Oct 10, 2023
c406c22
Merge pull request #64 from everettsouthwick/renovate/docker-login-ac…
everettsouthwick Oct 10, 2023
b97c43f
Merge pull request #63 from everettsouthwick/renovate/docker-build-pu…
everettsouthwick Oct 10, 2023
7fa8f24
chore(deps): update docker/metadata-action action to v5
renovate[bot] Oct 10, 2023
aab8dee
Merge pull request #65 from everettsouthwick/renovate/docker-metadata…
everettsouthwick Oct 10, 2023
7a3788f
Add renovate.json
renovate[bot] Oct 26, 2023
42a4330
Update renovate.json
everettsouthwick Oct 26, 2023
f715951
Merge pull request #68 from everettsouthwick/renovate/configure
everettsouthwick Oct 26, 2023
8d02f98
Merge branch 'develop' into main
everettsouthwick Oct 26, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker-develop-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to Docker Hub
uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
uses: docker/metadata-action@v5
with:
images: ecsouthwick/eraserr

- name: Build and push Docker image
uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build . --file Dockerfile --tag ecsouthwick/eraserr
8 changes: 4 additions & 4 deletions .github/workflows/docker-latest-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Log in to Docker Hub
uses: docker/login-action@b4bedf8053341df3b5a9f9e0f2cf4e79e27360c6
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@879dcbb708d40f8b8679d4f7941b938a086e23a7
uses: docker/metadata-action@v5
with:
images: ecsouthwick/eraserr

- name: Build and push Docker image
uses: docker/build-push-action@4c1b68d83ad20cc1a09620ca477d5bbbb5fa14d0
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
11 changes: 11 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":automergeStableNonMajor",
"schedule:nonOfficeHours"
],
"baseBranches": [
"develop"
]
}
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
PlexAPI==4.15.2
PlexAPI==4.15.4
Requests==2.31.0
retry==0.9.2
schedule==1.2.0
schedule==1.2.1
Loading