Squashed commit of the following:

commit 86e8eca82a2167bcb5934a0aa062448e6df13e4f
Author: Geoff Bourne <itzgeoff@gmail.com>
Date:   Sat Jul 25 15:57:36 2020 -0500

    ci: Simplified naming of only test compose file

commit d88a77f6ea688db7b96b21cda6b6999ea214b7c1
Author: Geoff Bourne <itzgeoff@gmail.com>
Date:   Sat Jul 25 15:52:05 2020 -0500

    ci: Switched to DockerHub build and test
This commit is contained in:
Geoff Bourne committed 2020-07-25 16:05:28 -05:00
1 parent 6492c55c45
commit 2d7769e8bb
5 files changed
+1 -97

No files matched your search

-39
View File
@@ -1,39 +0,0 @@
name: Build
on:
push:
branches:
- master
tags:
- "[0-9]+.[0-9]+.[0-9]+"
jobs:
# test:
# runs-on: ubuntu-latest
#
# steps:
# - uses: actions/checkout@v2
#
# - name: Run tests
# run: |
# tests/test.sh
build:
# needs: [test]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build and push Docker images
uses: docker/build-push-action@v1.1.0
with:
repository: itzg/minecraft-bedrock-server
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}
tag_with_ref: true
tag_with_sha: false
builds_args: BUILDKIT_INLINE_CACHE=1
always_pull: true
cache_froms: itzg/minecraft-bedrock-server:latest
add_git_labels: true
push: true
-16
View File
@@ -1,16 +0,0 @@
name: Validate PR
on:
pull_request:
branches: [ master ]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Run tests
run: |
tests/test.sh
@@ -8,7 +8,7 @@ services:
command: status-bedrock --host mc --retry-interval 1s --retry-limit 60
mc:
build:
context: ..
context: .
environment:
EULA: "TRUE"
-21
View File
@@ -1,21 +0,0 @@
version: "3.8"
services:
sut:
depends_on:
- mc
image: itzg/mc-monitor:0.6.0
command: status-bedrock --host mc --retry-interval 1s --retry-limit 90
mc:
build:
context: ..
environment:
EULA: "TRUE"
VERSION: "${BDS_VERSION}"
volumes:
- mc:/data
volumes:
mc:
external:
name: mc-shared
-20
View File
@@ -1,20 +0,0 @@
#!/bin/sh
# Args:
# - compose project
# - test description
runTest() {
composeArgs="-f docker-compose.$1.test.yml -p $1"
failed=false
docker-compose ${composeArgs} run sut || failed=true
$failed && docker-compose ${composeArgs} logs
docker-compose ${composeArgs} down -v
if $failed; then
echo "Test failed using compose project $1: $2"
exit 1
fi
}
cd $(dirname $0)
runTest defaults "using defaults"