From 7fd065f17bc3199c6d0f82e2bb89e8e2e8f81de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 16 Feb 2023 14:14:39 +0100 Subject: [PATCH] properly list php versions as strings --- .github/workflows/ci.yml | 4 ++-- Dockerfile | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9aa5023b..0272d86c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,9 @@ jobs: matrix: include: - laravel: 9 - php: 8.0 + php: "8.0" - laravel: 10 - php: 8.1 + php: "8.1" steps: - uses: actions/checkout@v2 diff --git a/Dockerfile b/Dockerfile index 01c660ec..6a66bde2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,9 +17,6 @@ RUN apt-get update \ && apt-get update \ && ACCEPT_EULA=Y apt-get install -y unixodbc-dev=2.3.7 unixodbc=2.3.7 odbcinst1debian2=2.3.7 odbcinst=2.3.7 msodbcsql17 -# temporary fix (the below step wasn't working properly on GH) -RUN rm -f /etc/alternatives/php && sudo update-alternatives --install /usr/bin/php php /usr/bin/php$PHP_VERSION 1 - # set PHP version RUN update-alternatives --set php /usr/bin/php$PHP_VERSION \ && update-alternatives --set phar /usr/bin/phar$PHP_VERSION \