From 3cab902752eb0513d0488a19bb02b8cdc3463521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emrik=20=C3=96stling?= Date: Thu, 30 May 2024 14:36:05 +0200 Subject: [PATCH 1/5] chore: make use latest image instead of main --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db35d93..ac167d6 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ A self-hosted online file converter. Supports 831 different formats. Written wit # docker-compose.yml services: convertx: - image: ghcr.io/c4illin/convertx:main + image: ghcr.io/c4illin/convertx ports: - "3000:3000" environment: # Defaults are listed below. All are optional. From b979bd4f1369b687056d9480aa2805c23c752021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emrik=20=C3=96stling?= Date: Thu, 30 May 2024 16:13:59 +0200 Subject: [PATCH 2/5] chore: update badges --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ac167d6..9ac1ad3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ ![ConvertX](images/logo.png) # ConvertX [![Docker](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml) +![GitHub Release](https://img.shields.io/github/v/release/C4illin/ConvertX) +![GitHub commits since latest release](https://img.shields.io/github/commits-since/C4illin/ConvertX/latest) A self-hosted online file converter. Supports 831 different formats. Written with Typescript, Bun and Elysia. From 337cfdc15b53fa5aa7924459a13efd2f8d7ca935 Mon Sep 17 00:00:00 2001 From: C4illin Date: Thu, 30 May 2024 16:16:30 +0200 Subject: [PATCH 3/5] chore: add maintain PR workflow This commit adds a new workflow file, `.github/workflows/maintain-pr.yml`, which sets up a workflow to maintain release merge pull requests. The workflow is triggered on pushes to the `main` branch. It includes steps to check for an existing PR, create/update a PR if it doesn't exist, and reset the release branch if needed. --- .github/workflows/maintain-pr.yml | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/maintain-pr.yml diff --git a/.github/workflows/maintain-pr.yml b/.github/workflows/maintain-pr.yml new file mode 100644 index 0000000..110ed28 --- /dev/null +++ b/.github/workflows/maintain-pr.yml @@ -0,0 +1,40 @@ +name: Maintain Release Merge PR + +on: + push: + branches: + - main + +jobs: + update-release-pr: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup Git + run: | + git config user.name github-actions + git config user.email github-actions@github.com + - name: Check for existing PR + id: find-pr + uses: juliangruber/find-pull-request-action@v1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + branch: release + - uses: actions/checkout@v4 + if: steps.find-pr.outputs.number == '' + with: + ref: release + - name: Reset release branch + if: steps.find-pr.outputs.number == '' + run: | + git fetch origin main:main + git reset --hard main + - name: Create/Update PR + if: steps.find-pr.outputs.number == '' + uses: peter-evans/create-pull-request@v6 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update release branch + title: Merge Release Auto-PR + body: Merging this PR will invoke release actions + branch: auto-update/release \ No newline at end of file From 84fd5367cea53bb913fe6154f1781377ff4a0bd7 Mon Sep 17 00:00:00 2001 From: C4illin Date: Thu, 30 May 2024 16:18:07 +0200 Subject: [PATCH 4/5] chore: update actions/checkout to v4 in maintain PR workflow --- .github/workflows/maintain-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maintain-pr.yml b/.github/workflows/maintain-pr.yml index 110ed28..9387bf3 100644 --- a/.github/workflows/maintain-pr.yml +++ b/.github/workflows/maintain-pr.yml @@ -9,7 +9,7 @@ jobs: update-release-pr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Git run: | git config user.name github-actions From 1ac4808a648dae838ca583ff8cd937b255f939a8 Mon Sep 17 00:00:00 2001 From: C4illin Date: Thu, 30 May 2024 16:18:51 +0200 Subject: [PATCH 5/5] chore: remove maintain PR workflow This commit removes the maintain PR workflow file, `.github/workflows/maintain-pr.yml`. The workflow was no longer needed and has been deleted. --- .github/workflows/maintain-pr.yml | 40 ------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/maintain-pr.yml diff --git a/.github/workflows/maintain-pr.yml b/.github/workflows/maintain-pr.yml deleted file mode 100644 index 9387bf3..0000000 --- a/.github/workflows/maintain-pr.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Maintain Release Merge PR - -on: - push: - branches: - - main - -jobs: - update-release-pr: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup Git - run: | - git config user.name github-actions - git config user.email github-actions@github.com - - name: Check for existing PR - id: find-pr - uses: juliangruber/find-pull-request-action@v1 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - branch: release - - uses: actions/checkout@v4 - if: steps.find-pr.outputs.number == '' - with: - ref: release - - name: Reset release branch - if: steps.find-pr.outputs.number == '' - run: | - git fetch origin main:main - git reset --hard main - - name: Create/Update PR - if: steps.find-pr.outputs.number == '' - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update release branch - title: Merge Release Auto-PR - body: Merging this PR will invoke release actions - branch: auto-update/release \ No newline at end of file