Fix fromJson

Signed-off-by: Marcos Candeia <[email protected]>
deco-sites · Oct 24, 2023 · 1c3e91c · 1c3e91c
1 parent da77847
commit 1c3e91c
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/workflows/deco-deploy.yaml b/.github/workflows/deco-deploy.yaml
@@ -15,20 +15,12 @@ jobs:
         id: set-vars
         shell: bash
         run: |
-<<<<<<< HEAD
           echo "site-matrix=[${{ vars.SITES || github.event.repository.name }}]" >> $GITHUB_OUTPUT
   deploy:
     needs: set-vars
     strategy:
       matrix:
         site: ${{ fromJson(${{ needs.set-vars.outputs.site-matrix }})) }}
-=======
-          echo "site-matrix=${{ vars.SITES || github.event.repository.name }}" >> $GITHUB_OUTPUT
-  deploy:
-    strategy:
-      matrix:
-        site: fromJson(${{ jobs.set-vars.outputs.site-matrix }}))
->>>>>>> aa63586 (Fix site matrix)
     name: Deploy
     runs-on: ubuntu-latest