Simplify GitHub Action workflow

This commit is contained in:
cytopia
2019-11-03 22:54:27 +01:00
parent a6236b19c7
commit 87234a6f46
2 changed files with 11 additions and 68 deletions

View File

@@ -77,14 +77,9 @@ jobs:
uses: actions/checkout@v1 uses: actions/checkout@v1
# ------------------------------------------------------------ # ------------------------------------------------------------
# Build Base # Base
# ------------------------------------------------------------ # ------------------------------------------------------------
- name: Build Base - name: Build Base
run: make rebuild-base VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Build Base (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -100,17 +95,8 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------
# Test Base
# ------------------------------------------------------------
- name: Test Base - name: Test Base
run: make test-base VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Test Base (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -126,18 +112,12 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------ # ------------------------------------------------------------
# Build Mods # Mods
# ------------------------------------------------------------ # ------------------------------------------------------------
- name: Build Mods - name: Build Mods
run: make rebuild-mods VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Build Mods (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -153,17 +133,8 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------
# Test Mods
# ------------------------------------------------------------
- name: Test Mods - name: Test Mods
run: make test-mods VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Test Mods (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -179,18 +150,12 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------ # ------------------------------------------------------------
# Build Prod # Prod
# ------------------------------------------------------------ # ------------------------------------------------------------
- name: Build Prod - name: Build Prod
run: make rebuild-prod VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Build Prod (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -206,17 +171,8 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------
# Test Prod
# ------------------------------------------------------------
- name: Test Prod - name: Test Prod
run: make test-prod VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Test Prod (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -232,18 +188,12 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------ # ------------------------------------------------------------
# Build Work # Work
# ------------------------------------------------------------ # ------------------------------------------------------------
- name: Build Work - name: Build Work
run: make rebuild-work VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Build Work (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -259,17 +209,8 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------
# Test Work
# ------------------------------------------------------------
- name: Test Work - name: Test Work
run: make test-work VERSION=${VERSION}
env:
VERSION: ${{ matrix.version }}
- name: Test Work (Retry)
run: | run: |
retry() { retry() {
for ((n=0; n<${RETRIES}; n++)); do for ((n=0; n<${RETRIES}; n++)); do
@@ -285,7 +226,7 @@ jobs:
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
RETRIES: 5 RETRIES: 5
if: failure()
# ------------------------------------------------------------ # ------------------------------------------------------------
# Diff README.md # Diff README.md
@@ -293,9 +234,11 @@ jobs:
- name: Diff README.md - name: Diff README.md
run: | run: |
make gen-readme VERSION=${VERSION} make gen-readme VERSION=${VERSION}
git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
env: env:
VERSION: ${{ matrix.version }} VERSION: ${{ matrix.version }}
# ------------------------------------------------------------ # ------------------------------------------------------------
# Push build artifacts # Push build artifacts
# ------------------------------------------------------------ # ------------------------------------------------------------

View File

@@ -82,16 +82,16 @@ before_script:
# Build (multiple tries due to network outages) # Build (multiple tries due to network outages)
- retry make build-base VERSION=${PHP} - retry make build-base VERSION=${PHP}
- retry make test-base VERSION=${PHP} - retry make test-base VERSION=${PHP}
- retry make build-mods VERSION=${PHP} - retry make build-mods VERSION=${PHP}
- retry make test-mods VERSION=${PHP} - retry make test-mods VERSION=${PHP}
- retry make build-prod VERSION=${PHP} - retry make build-prod VERSION=${PHP}
- retry make test-prod VERSION=${PHP} - retry make test-prod VERSION=${PHP}
- retry make build-work VERSION=${PHP} - retry make build-work VERSION=${PHP}
- retry make test-work VERSION=${PHP} - retry make test-work VERSION=${PHP}
# Test if PHP modules have changed # Test if PHP modules have changed
- make gen-readme VERSION=${PHP} - make gen-readme VERSION=${PHP}