From 087632aa020e04e2b28f7ea84ceabb71b98ebc11 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 5 Apr 2022 08:16:05 +0100 Subject: [PATCH 1/3] Bumping version to 2.1.8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9671f9a..b370e25 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.7 \ No newline at end of file +2.1.8 \ No newline at end of file From a67bd2f310bdc10a47c374aef8c4322235d4e976 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 5 Apr 2022 08:16:12 +0100 Subject: [PATCH 2/3] Using latest base images --- 5.6/Dockerfile | 2 +- 7.4/Dockerfile | 2 +- 8.0/Dockerfile | 2 +- generate-dockerfiles.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 434ece8..3aa0bc5 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/apache:apache2.4.4x-2.1.6 +FROM bfren/apache:apache2.4.4x-2.1.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" diff --git a/7.4/Dockerfile b/7.4/Dockerfile index dcf8ebf..f24befa 100644 --- a/7.4/Dockerfile +++ b/7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/apache:apache2.4.5x-2.1.6 +FROM bfren/apache:apache2.4.5x-2.1.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 066e2f4..e726413 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM bfren/apache:apache2.4.5x-2.1.6 +FROM bfren/apache:apache2.4.5x-2.1.7 LABEL org.opencontainers.image.source="https://github.com/bfren/docker-apache-php" diff --git a/generate-dockerfiles.sh b/generate-dockerfiles.sh index c82f623..2bfa175 100644 --- a/generate-dockerfiles.sh +++ b/generate-dockerfiles.sh @@ -4,7 +4,7 @@ set -euo pipefail docker pull bfren/alpine -BASE_REVISION="2.1.6" +BASE_REVISION="2.1.7" echo "Base: ${BASE_REVISION}" PHP_VERSIONS="5.6 7.4 8.0" From 0b08ecc0d0323f546ab89763fa770f779ebe34b6 Mon Sep 17 00:00:00 2001 From: bfren Date: Tue, 5 Apr 2022 08:16:18 +0100 Subject: [PATCH 3/3] Moving conditional in auto workflows --- .github/workflows/auto-pr.yml | 2 +- .github/workflows/auto-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 28b94cf..213d5b8 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -5,8 +5,8 @@ on: jobs: create-pr: + if: github.ref_type == 'branch' runs-on: ubuntu-latest - if: ${{ github.ref_type == 'branch' }} steps: - name: Checkout Branch ${{ github.ref_name }} diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml index 4ca1d43..1f0e0dc 100644 --- a/.github/workflows/auto-release.yml +++ b/.github/workflows/auto-release.yml @@ -6,10 +6,10 @@ on: jobs: create-release: + if: github.event.pull_request.merged runs-on: ubuntu-latest steps: - - if: github.event.pull_request.merged == true name: Get Pull Request Title run: echo "PR_TITLE=${{ github.event.pull_request.title }}" >> $GITHUB_ENV shell: bash