Skip to content

Commit

Permalink
CI fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jbboehr committed Jul 1, 2020
1 parent 960965b commit 238e812
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/php-alpine.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG PHP_VERSION=7.4
ARG PHP_TYPE=alpine
ARG BASE_IMAGE=php:${PHP_VERSION}-${PHP_TYPE}
ARG LIBMUSTACHE_VERSION=eeaf51a8c2fc90a10e7f2f2b80667e886ae21e4b
ARG LIBMUSTACHE_VERSION=master

# image0
FROM ${BASE_IMAGE}
Expand Down
2 changes: 1 addition & 1 deletion .github/php-debian.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

ARG PHP_VERSION=7.4
ARG BASE_IMAGE=php:$PHP_VERSION
ARG LIBMUSTACHE_VERSION=eeaf51a8c2fc90a10e7f2f2b80667e886ae21e4b
ARG LIBMUSTACHE_VERSION=master

# image0
FROM ${BASE_IMAGE}
Expand Down
2 changes: 1 addition & 1 deletion .github/php-fedora.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

ARG BASE_IMAGE=fedora:latest
ARG LIBMUSTACHE_VERSION=eeaf51a8c2fc90a10e7f2f2b80667e886ae21e4b
ARG LIBMUSTACHE_VERSION=master

# image0
FROM ${BASE_IMAGE}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function docker_build() (
-f .github/php-${DOCKER_NAME}.Dockerfile \
-t php-mustache \
--build-arg PHP_VERSION=${PHP_VERSION} \
--build-arg LIBMUSTACHE_VERSION=${LIBMUSTACHE_VERSION} \
.
)

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ export PHP_VERSION=${PHP_VERSION:-"7.4"}
export NO_INTERACTION=1
export REPORT_EXIT_STATUS=1
export TEST_PHP_EXECUTABLE=${TEST_PHP_EXECUTABLE:-`which php`}
export LIBMUSTACHE_VERSION=eeaf51a8c2fc90a10e7f2f2b80667e886ae21e4b

function install_brew_packages() (
set -o errexit -o pipefail -o xtrace
Expand Down

0 comments on commit 238e812

Please sign in to comment.