Skip to content

Commit 969051b

Browse files
committed
ci: move docker-release to docker.yml
1 parent bd813fc commit 969051b

File tree

2 files changed

+3
-41
lines changed

2 files changed

+3
-41
lines changed

.github/workflows/docker.yml

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111
push:
1212
branches:
1313
- main
14+
tags:
15+
- "*-?v[0-9]+*"
1416
pull_request:
1517
branches:
1618
- main

.github/workflows/release.yml

+1-41
Original file line numberDiff line numberDiff line change
@@ -113,51 +113,11 @@ jobs:
113113
run: |
114114
gh release upload ${{ github.ref_name }} "tmp/script.ryot.zip"
115115
116-
docker-release:
117-
runs-on: ubuntu-latest
118-
needs: create-release
119-
steps:
120-
- name: Checkout repository
121-
uses: actions/checkout@v3
122-
123-
- name: Set up QEMU
124-
uses: docker/setup-qemu-action@v2
125-
126-
- name: Set up Docker Buildx
127-
uses: docker/setup-buildx-action@v2
128-
129-
- name: Log in to the Container registry
130-
uses: docker/login-action@v2
131-
with:
132-
registry: ${{ env.REGISTRY }}
133-
username: ${{ github.actor }}
134-
password: ${{ secrets.GITHUB_TOKEN }}
135-
136-
- name: Get docker image name and build args
137-
id: required_args
138-
run: |
139-
image_name="${{ env.REGISTRY }}/${{ github.actor }}/${{ github.event.repository.name }}"
140-
image_names="$image_name:${{ github.ref_name }},$image_name:unstable"
141-
if [ "${{ needs.create-release.outputs.is-prerelease }}" = "false" ]; then
142-
image_names="$image_names,$image_name:latest"
143-
fi
144-
# lowercase the name
145-
image_names=$(echo "$image_names" | tr '[:upper:]' '[:lower:]')
146-
echo "image_names=$image_names" >> $GITHUB_OUTPUT
147-
148-
- name: Build and push to ghcr
149-
uses: docker/build-push-action@v3
150-
with:
151-
context: .
152-
platforms: linux/amd64,linux/arm64
153-
push: true
154-
tags: ${{ steps.required_args.outputs.image_names }}
155-
156116
# Mark the Github Release™ as a non-draft now that everything has succeeded!
157117
publish-release:
158118
# Only run after all the other tasks, but it's ok if upload-artifacts was skipped
159119
needs:
160-
[create-release, upload-artifacts, docker-release, upload-kodi-plugin]
120+
[create-release, upload-artifacts, upload-kodi-plugin]
161121
if: ${{ always() && needs.create-release.result == 'success' && (needs.upload-artifacts.result == 'skipped' || needs.upload-artifacts.result == 'success') }}
162122
runs-on: ubuntu-latest
163123
env:

0 commit comments

Comments
 (0)