From da62b5849ddd28b34c72dc98aa2811ad96c4ee4c Mon Sep 17 00:00:00 2001
From: Gourav <gourav.upadhyay@gamezop.co>
Date: Fri, 8 Mar 2024 11:43:13 +0530
Subject: [PATCH 1/4] change in elixer version and made version universal

---
 .github/workflows/elixir-build-test.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/elixir-build-test.yaml b/.github/workflows/elixir-build-test.yaml
index e4224c5..235a1d5 100644
--- a/.github/workflows/elixir-build-test.yaml
+++ b/.github/workflows/elixir-build-test.yaml
@@ -7,6 +7,14 @@ on:
       flag_test_coverage:
         required: false
         type: boolean
+      elixer_version:
+        type: string
+        required: false
+        default: 1.16.1
+      otp_version:
+        type: string
+        required: false 
+        default: 24.0
     secrets:
       DOCKER_HUB_USERNAME:
         required: true
@@ -25,8 +33,9 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        elixir: ['1.13.4']
-        otp: ['24.0']
+        elixir: ${{ inputs.elixer_version }}
+        otp: ${{ inputs.otp_version }}
+
     steps:
       - uses: actions/checkout@v3
       - name: Log in to Docker Hub

From e97c6c3892b5f2825727e02fdf4a091b4d6b8531 Mon Sep 17 00:00:00 2001
From: Gourav <gourav.upadhyay@gamezop.co>
Date: Fri, 8 Mar 2024 12:30:58 +0530
Subject: [PATCH 2/4] syntex error fic

---
 .github/workflows/elixir-build-test.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/elixir-build-test.yaml b/.github/workflows/elixir-build-test.yaml
index 235a1d5..8e3df6b 100644
--- a/.github/workflows/elixir-build-test.yaml
+++ b/.github/workflows/elixir-build-test.yaml
@@ -7,14 +7,14 @@ on:
       flag_test_coverage:
         required: false
         type: boolean
-      elixer_version:
+      elixir_version:
         type: string
         required: false
-        default: 1.16.1
+        default: '1.13.4'
       otp_version:
         type: string
         required: false 
-        default: 24.0
+        default: '24.0'
     secrets:
       DOCKER_HUB_USERNAME:
         required: true
@@ -33,8 +33,8 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        elixir: ${{ inputs.elixer_version }}
-        otp: ${{ inputs.otp_version }}
+        elixir: [ ${{ inputs.elixir_version }} ]
+        otp: [ ${{ inputs.otp_version }} ]
 
     steps:
       - uses: actions/checkout@v3

From b660fbd1fce796842050c97ffe635328341ced98 Mon Sep 17 00:00:00 2001
From: Gourav <gourav.upadhyay@gamezop.co>
Date: Fri, 8 Mar 2024 14:43:25 +0530
Subject: [PATCH 3/4] change in formate of elixir version in workflow

---
 .github/workflows/elixir-img-push.yaml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/elixir-img-push.yaml b/.github/workflows/elixir-img-push.yaml
index 73c981f..699638b 100644
--- a/.github/workflows/elixir-img-push.yaml
+++ b/.github/workflows/elixir-img-push.yaml
@@ -10,6 +10,14 @@ on:
       path-docker-file:
         required: true
         type: string
+      elixir_version:
+        type: string
+        required: false
+        default: '1.13.4'
+      otp_version:
+        type: string
+        required: false 
+        default: '24.0'
     secrets:
       DOCKER_HUB_USERNAME:
         required: true
@@ -32,10 +40,7 @@ jobs:
       MIX_ENV: prod
     if: startsWith(github.event.ref, 'refs/tags/')
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        elixir: ['1.13.4']
-        otp: ['24.0']
+    
     outputs:
       app-version: ${{ steps.pushing-img.outputs.app-version }}
     steps:
@@ -50,8 +55,8 @@ jobs:
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: ${{matrix.elixir}} # Define the elixir version [required]
-          otp-version: ${{matrix.otp}} # Define the OTP version [required]
+          elixir-version: ${{ inputs.elixir_version }} # Define the elixir version [required]
+          otp-version: ${{ inputs.otp_version }} # Define the OTP version [required]
           experimental-otp: true
       - name: Retrieve Mix dependencies Cache
         uses: actions/cache@v3
@@ -92,10 +97,7 @@ jobs:
     env:
       MIX_ENV: dev
     runs-on: ubuntu-20.04
-    strategy:
-      matrix:
-        elixir: ['1.13.4']
-        otp: ['24.0']
+    
     outputs:
       app-version: ${{ steps.pushing-img.outputs.app-version }}
     steps:
@@ -108,8 +110,8 @@ jobs:
       - name: Set up Elixir
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: ${{matrix.elixir}} # Define the elixir version [required]
-          otp-version: ${{matrix.otp}} # Define the OTP version [required]
+          elixir-version: ${{ inputs.elixir_version }} # Define the elixir version [required]
+          otp-version: ${{ inputs.otp_version }} # Define the OTP version [required]
           experimental-otp: true
       - name: Retrieve Mix dependencies Cache
         uses: actions/cache@v3

From e68986dd16862e3abbeb927cde808e4de9e53102 Mon Sep 17 00:00:00 2001
From: Gourav <gourav.upadhyay@gamezop.co>
Date: Mon, 11 Mar 2024 11:11:49 +0530
Subject: [PATCH 4/4] correction

---
 .github/workflows/elixir-build-test.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/elixir-build-test.yaml b/.github/workflows/elixir-build-test.yaml
index 27da4a8..078713a 100644
--- a/.github/workflows/elixir-build-test.yaml
+++ b/.github/workflows/elixir-build-test.yaml
@@ -31,14 +31,6 @@ jobs:
   build_test:
     name: Build and test
     runs-on: ubuntu-20.04
-<<<<<<< HEAD
-    strategy:
-      matrix:
-        elixir: [ ${{ inputs.elixir_version }} ]
-        otp: [ ${{ inputs.otp_version }} ]
-
-=======
->>>>>>> origin/main
     steps:
       - uses: actions/checkout@v3
       - name: Log in to Docker Hub