From b7f00706bd531130ac53e9b6d6252f713d69858a Mon Sep 17 00:00:00 2001
From: Mac Siri <mac@forem.com>
Date: Tue, 21 Mar 2023 10:05:31 -0400
Subject: [PATCH] [CI] Adjust cancel-in-progress concurrency (#19244)

* [CI] Adjust cancel-in-progress concurrency

* Revert "[CI] Lock setup-ruby to v1.144.0 (#19243)"

This reverts commit 44a3527983fb0439d4fedaccc1fd50c3db01af49.
---
 .github/workflows/ci-cd.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 2d7da767f..a79c664f5 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -9,7 +9,7 @@ on:
       - main
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{  github.ref != 'main' }}
+  cancel-in-progress: ${{  github.ref != 'refs/heads/main' }}
 
 env:
   COVERAGE: true
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1.144.0
+      - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
 
@@ -74,7 +74,7 @@ jobs:
           key: ${{ runner.os }}-precompiled-assets-${{ hashFiles('app/assets/**', 'app/javascript/**', 'config/webpack/**', 'config/webpacker.yml', '**/package.json', '**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-precompiled-assets-
       - name: setup ruby
-        uses: ruby/setup-ruby@v1.144.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
         if: steps.precompiled-asset.outputs.cache-hit != 'true'
@@ -102,7 +102,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: setup ruby
-        uses: ruby/setup-ruby@v1.144.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - uses: actions/setup-node@v3
@@ -174,7 +174,7 @@ jobs:
           node-version: 16
           cache: yarn
       - name: setup ruby
-        uses: ruby/setup-ruby@v1.144.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - run: bundle exec rails db:test:prepare
@@ -297,7 +297,7 @@ jobs:
           node-version: 16
           cache: yarn
       - name: setup ruby
-        uses: ruby/setup-ruby@v1.144.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - run: bundle exec rails assets:precompile
@@ -349,7 +349,7 @@ jobs:
           node-version: 16
           cache: yarn
       - name: setup ruby
-        uses: ruby/setup-ruby@v1.144.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - run: bundle exec rails db:test:prepare