fix: issue on merging

zeam-vm · Jan 3, 2025 · fe3128c · fe3128c
1 parent bc15f19
commit fe3128c
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/.github/workflows/reusable_ci_with_working_directory.yml b/.github/workflows/reusable_ci_with_working_directory.yml
@@ -114,19 +114,7 @@ jobs:
         restore-keys: |
           plt-${{ runner.os }}-${{ steps.system-info.outputs.release }}-${{ matrix.otp-version }}-${{ matrix.elixir-version }}-${{ inputs.working-directory }}-
         path: |
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
           ${{ github.workspace }}/${{ inputs.working-directory }}/_build/test/dialyxir_erlang-${{ matrix.otp-version }}_elixir-${{ matrix.elixir-version }}_deps-test.plt
-=======
-          priv/plts
->>>>>>> 6bbe76e (ci: check dialyzer with option plt (#779))
-=======
-          ${{ github.workspace }}/${{ inputs.working-directory }}/priv/plts
->>>>>>> 0037a87 (fix: issue on saving plt)
-=======
-          ${{ github.workspace }}/${{ inputs.working-directory }}/_build/test/dialyxir_erlang-${{ matrix.otp-version }}_elixir-${{ matrix.elixir-version }}_deps-test.plt
->>>>>>> 0d90e76 (fix: issue on saving plt)
     - name: Create PLTs
       if: steps.plt_cache.outputs.cache-hit != 'true' && ${{ inputs.perform-check && startsWith(runner.os, 'linux') }}
       run: mix dialyzer --plt
@@ -138,19 +126,7 @@ jobs:
         key: |
           plt-${{ runner.os }}-${{ steps.system-info.outputs.release }}-${{ matrix.otp-version }}-${{ matrix.elixir-version }}-${{ inputs.working-directory }}-${{ hashFiles('**/mix.lock') }}
         path: |
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-          ${{ github.workspace }}/${{ inputs.working-directory }}/_build/test/dialyxir_erlang-${{ matrix.otp-version }}_elixir-${{ matrix.elixir-version }}_deps-test.plt
-=======
-          priv/plts    
->>>>>>> 6bbe76e (ci: check dialyzer with option plt (#779))
-=======
-          ${{ github.workspace }}/${{ inputs.working-directory }}/priv/plts    
->>>>>>> 0037a87 (fix: issue on saving plt)
-=======
           ${{ github.workspace }}/${{ inputs.working-directory }}/_build/test/dialyxir_erlang-${{ matrix.otp-version }}_elixir-${{ matrix.elixir-version }}_deps-test.plt
->>>>>>> 0d90e76 (fix: issue on saving plt)
     - name: Check by dialyzer (Ubuntu)
       id: dialyzer
       if: ${{ inputs.perform-check && startsWith(runner.os, 'linux') }}