From 0c7a895aa577ce1305a2f7a13253ed894227c384 Mon Sep 17 00:00:00 2001
From: Carlos Gomes <carlos.algms@gmail.com>
Date: Tue, 4 Oct 2022 10:46:29 +0200
Subject: [PATCH] Remove env from interpolations

---
 .github/workflows/ci.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb25a6b..193a9b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,10 +6,6 @@ on:
       - main
   workflow_dispatch:
 
-env:
-  LATEST: php8
-  IMAGE: carlosalgms/composer-and-node-ci
-
 jobs:
   build_latest:
     runs-on: ubuntu-latest
@@ -17,11 +13,11 @@ jobs:
       matrix:
         tag: [php8, php7.1]
         image: [carlosalgms/composer-and-node-ci]
+        latest: [php8]
         include:
           - tag: php8
 
             buildArgs: ""
-            # tags: ${{ matrix.image }}:latest,${{ matrix.image }}:${{ matrix.tag }}
 
           - tag: php7.1
             buildArgs: |
@@ -30,7 +26,7 @@ jobs:
               COMPOSER_VERSION=2.2.18
     env:
       TAGGED_IMAGE: ${{ matrix.image }}:${{ matrix.tag }}
-      TAGS: ${{ matrix.tag == env.LATEST && format('{0}:latest,{0}:{1}', matrix.image, matrix.tag) || format('{0}:{1}', matrix.image, matrix.tag) }}
+      TAGS: ${{ matrix.tag == matrix.latest && format('{0}:latest,', matrix.image) || '' }}${{ matrix.image }}:${{ matrix.tag }}
     steps:
       - uses: actions/checkout@v2