amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-24 18:16:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into java11-openj9

Browse Source 
# Conflicts:
#	.github/workflows/build-multiarch.yml
#	docker-versions-create.sh
This commit is contained in:
Geoff Bourne
2021-05-21 22:41:16 -05:00
parent 21d7fb476b 2f489b04ae
commit 577eef3631
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build-multiarch.yml vendored
View File

@@ -5,15 +5,17 @@ on:
- master
- "*-multiarch"
- "multiarch*"
- java11
- java15
- java8-openj9
- java11*
- java15*
- java16*
- test/multiarch/*
tags:
- "[0-9]+.[0-9]+.[0-9]+"
- "[0-9]+.[0-9]+.[0-9]+-multiarch*"
- "[0-9]+.[0-9]+.[0-9]+-*multiarch"
- "[0-9]+.[0-9]+.[0-9]+-java11"
- "[0-9]+.[0-9]+.[0-9]+-java8-openj9"
- "[0-9]+.[0-9]+.[0-9]+-java11*"
- "[0-9]+.[0-9]+.[0-9]+-java15"
- "[0-9]+.[0-9]+.[0-9]+-java16*"
paths-ignore: