mirror of
https://github.com/itzg/docker-minecraft-server.git
synced 2026-03-01 04:16:25 +00:00
Merge latest from master
This commit is contained in:
7
.github/workflows/build-multiarch.yml
vendored
7
.github/workflows/build-multiarch.yml
vendored
@@ -8,6 +8,7 @@ on:
|
||||
- java11*
|
||||
- java16*
|
||||
- java17*
|
||||
- test/**
|
||||
tags:
|
||||
- "[0-9]+.[0-9]+.[0-9]+"
|
||||
- "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
|
||||
@@ -56,7 +57,7 @@ jobs:
|
||||
|
||||
- name: Build for test
|
||||
uses: docker/build-push-action@v2.7.0
|
||||
if: github.ref_name == 'master'
|
||||
if: github.ref_name == 'master' || startsWith(github.ref_name, 'test/')
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64
|
||||
@@ -70,7 +71,7 @@ jobs:
|
||||
|
||||
- name: Run tests
|
||||
# It is assumed that image variants are merged from master and tested there
|
||||
if: github.ref_name == 'master'
|
||||
if: github.ref_name == 'master' || startsWith(github.ref_name, 'test/')
|
||||
run: |
|
||||
tests/test.sh
|
||||
|
||||
@@ -80,7 +81,7 @@ jobs:
|
||||
with:
|
||||
context: .
|
||||
platforms: linux/amd64
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
push: true
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
# ensure latest base image is used
|
||||
pull: true
|
||||
|
||||
2
.github/workflows/generate-toc.yml
vendored
2
.github/workflows/generate-toc.yml
vendored
@@ -16,6 +16,6 @@ jobs:
|
||||
curl https://raw.githubusercontent.com/ekalinin/github-markdown-toc/master/gh-md-toc -o gh-md-toc
|
||||
chmod a+x gh-md-toc
|
||||
./gh-md-toc --insert --no-backup README.md
|
||||
- uses: stefanzweifel/git-auto-commit-action@v4.12.0
|
||||
- uses: stefanzweifel/git-auto-commit-action@v4.13.1
|
||||
with:
|
||||
commit_message: "docs: Auto update markdown TOC"
|
||||
Reference in New Issue
Block a user