From fe3128cc1ea3f94d7ff4dc7e4c59fa6dd852dcd4 Mon Sep 17 00:00:00 2001 From: Susumu Yamazaki Date: Sat, 4 Jan 2025 06:30:11 +0900 Subject: [PATCH] fix: issue on merging --- .../reusable_ci_with_working_directory.yml | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/.github/workflows/reusable_ci_with_working_directory.yml b/.github/workflows/reusable_ci_with_working_directory.yml index ccb4a18..15fc023 100644 --- 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') }}