From 161c496af75d7359ce29d88d2c6d9ae79ec0c350 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Thu, 14 Jan 2021 16:13:22 +0100 Subject: [PATCH] gh-actions: reverse dependency of raphf<-http --- .github/workflows/ci.yml | 90 +++++++++++++++++------------- scripts/gen_github_workflow_ci.php | 9 +-- 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bd0e91..0d2fb1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -36,10 +41,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -66,6 +67,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -73,10 +79,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -103,6 +105,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -110,10 +117,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -140,6 +143,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -147,10 +155,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -177,6 +181,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -184,10 +193,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -215,6 +220,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -222,10 +232,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -252,6 +258,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -259,10 +270,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -289,6 +296,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -296,10 +308,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -326,6 +334,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -333,10 +346,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test @@ -363,6 +372,11 @@ jobs: - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -370,10 +384,6 @@ jobs: done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php index cb181b3..d5ade68 100755 --- a/scripts/gen_github_workflow_ci.php +++ b/scripts/gen_github_workflow_ci.php @@ -57,6 +57,11 @@ foreach ($job as $id => $env) { - name: Prepare run: | make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php + - name: Build + run: | + make -f scripts/ci/Makefile ext PECL=raphf + - name: Prepare Test + run: | if test -n "$PECLs"; then IFS=$',' for pecl in $PECLs; do @@ -64,10 +69,6 @@ foreach ($job as $id => $env) { done unset IFS fi - - - name: Build - run: | - make -f scripts/ci/Makefile ext PECL=raphf - name: Test run: | make -f scripts/ci/Makefile test -- 2.30.2