From 7f36dd8136c72c82841b56165edbae8acf2019ed Mon Sep 17 00:00:00 2001 From: Christian Koch <54853932+ckoch-cars@users.noreply.github.com> Date: Tue, 26 Sep 2023 14:56:20 -0500 Subject: [PATCH 1/2] add merge group --- .github/workflows/elixir.yml | 82 +++++++++++++++++++++++++++++------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 8457461..3250336 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -5,6 +5,8 @@ on: branches: [ "main" ] pull_request: branches: [ "main" ] + merge_group: + types: [checks_requested] permissions: contents: read @@ -16,22 +18,22 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - name: Set up Elixir v1.13 - uses: erlef/setup-beam@v1 - with: - elixir-version: '1.13.4' # Define the elixir version [required] - otp-version: '24.X' # Define the OTP version [required] - - name: Restore dependencies cache - uses: actions/cache@v3 - with: - path: deps - key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} - restore-keys: ${{ runner.os }}-mix- - - name: Install dependencies - run: mix deps.get - - name: Run tests - run: mix test + # - uses: actions/checkout@v3 + # - name: Set up Elixir v1.13 + # uses: erlef/setup-beam@v1 + # with: + # elixir-version: '1.13.4' # Define the elixir version [required] + # otp-version: '24.X' # Define the OTP version [required] + # - name: Restore dependencies cache + # uses: actions/cache@v3 + # with: + # path: deps + # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + # restore-keys: ${{ runner.os }}-mix- + # - name: Install dependencies + # run: mix deps.get + # - name: Run tests + # run: mix test - name: Set up Elixir v1.14 uses: erlef/setup-beam@v1 @@ -48,3 +50,51 @@ jobs: run: mix deps.get - name: Run tests run: mix test + + # - name: Set up Elixir v1.14 OTP25 + # uses: erlef/setup-beam@v1 + # with: + # elixir-version: '1.14.X' # Define the elixir version [required] + # otp-version: '25.X' # Define the OTP version [required] + # - name: Restore dependencies cache + # uses: actions/cache@v3 + # with: + # path: deps + # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + # restore-keys: ${{ runner.os }}-mix- + # - name: Install dependencies + # run: mix deps.get + # - name: Run tests + # run: mix test + + # - name: Set up Elixir v1.14 OTP26 + # uses: erlef/setup-beam@v1 + # with: + # elixir-version: '1.14.X' # Define the elixir version [required] + # otp-version: '26.X' # Define the OTP version [required] + # - name: Restore dependencies cache + # uses: actions/cache@v3 + # with: + # path: deps + # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + # restore-keys: ${{ runner.os }}-mix- + # - name: Install dependencies + # run: mix deps.get + # - name: Run tests + # run: mix test + + # - name: Set up Elixir v1.15 OTP26 + # uses: erlef/setup-beam@v1 + # with: + # elixir-version: '1.15.X' # Define the elixir version [required] + # otp-version: '26.X' # Define the OTP version [required] + # - name: Restore dependencies cache + # uses: actions/cache@v3 + # with: + # path: deps + # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + # restore-keys: ${{ runner.os }}-mix- + # - name: Install dependencies + # run: mix deps.get + # - name: Run tests + # run: mix test From c99d2265cb5100f18bf416820414b83739cc3d78 Mon Sep 17 00:00:00 2001 From: Christian Koch <54853932+ckoch-cars@users.noreply.github.com> Date: Tue, 26 Sep 2023 14:57:29 -0500 Subject: [PATCH 2/2] add tests for 1.14 otp 25, 26 --- .github/workflows/elixir.yml | 62 ++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml index 3250336..3e55401 100644 --- a/.github/workflows/elixir.yml +++ b/.github/workflows/elixir.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - # - uses: actions/checkout@v3 + - uses: actions/checkout@v3 # - name: Set up Elixir v1.13 # uses: erlef/setup-beam@v1 # with: @@ -51,37 +51,37 @@ jobs: - name: Run tests run: mix test - # - name: Set up Elixir v1.14 OTP25 - # uses: erlef/setup-beam@v1 - # with: - # elixir-version: '1.14.X' # Define the elixir version [required] - # otp-version: '25.X' # Define the OTP version [required] - # - name: Restore dependencies cache - # uses: actions/cache@v3 - # with: - # path: deps - # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} - # restore-keys: ${{ runner.os }}-mix- - # - name: Install dependencies - # run: mix deps.get - # - name: Run tests - # run: mix test + - name: Set up Elixir v1.14 OTP25 + uses: erlef/setup-beam@v1 + with: + elixir-version: '1.14.X' # Define the elixir version [required] + otp-version: '25.X' # Define the OTP version [required] + - name: Restore dependencies cache + uses: actions/cache@v3 + with: + path: deps + key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + restore-keys: ${{ runner.os }}-mix- + - name: Install dependencies + run: mix deps.get + - name: Run tests + run: mix test - # - name: Set up Elixir v1.14 OTP26 - # uses: erlef/setup-beam@v1 - # with: - # elixir-version: '1.14.X' # Define the elixir version [required] - # otp-version: '26.X' # Define the OTP version [required] - # - name: Restore dependencies cache - # uses: actions/cache@v3 - # with: - # path: deps - # key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} - # restore-keys: ${{ runner.os }}-mix- - # - name: Install dependencies - # run: mix deps.get - # - name: Run tests - # run: mix test + - name: Set up Elixir v1.14 OTP26 + uses: erlef/setup-beam@v1 + with: + elixir-version: '1.14.X' # Define the elixir version [required] + otp-version: '26.X' # Define the OTP version [required] + - name: Restore dependencies cache + uses: actions/cache@v3 + with: + path: deps + key: ${{ runner.os }}-mix-${{ hashFiles('**/mix.lock') }} + restore-keys: ${{ runner.os }}-mix- + - name: Install dependencies + run: mix deps.get + - name: Run tests + run: mix test # - name: Set up Elixir v1.15 OTP26 # uses: erlef/setup-beam@v1