Skip to content

Commit 2e4ed9d

Browse files
committed
👷 Fix ACT condition for appraisal attempts
1 parent 062c606 commit 2e4ed9d

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/workflows/current.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
- name: "[Attempt 2] Install Root Appraisal"
9494
id: bundleAttempt2
9595
# If bundleAttempt1 failed, try again here; Otherwise skip.
96-
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
96+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
9797
run: bundle
9898

9999
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
@@ -107,7 +107,7 @@ jobs:
107107
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
108108
id: bundleAppraisalAttempt2
109109
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
110-
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
110+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
111111
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
112112

113113
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}

.github/workflows/dep-heads.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
- name: "[Attempt 2] Install Root Appraisal"
9696
id: bundleAttempt2
9797
# If bundleAttempt1 failed, try again here; Otherwise skip.
98-
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
98+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
9999
run: bundle
100100

101101
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
@@ -109,7 +109,7 @@ jobs:
109109
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
110110
id: bundleAppraisalAttempt2
111111
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
112-
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
112+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
113113
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
114114

115115
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}

.github/workflows/heads.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: "[Attempt 2] Install Root Appraisal"
9595
id: bundleAttempt2
9696
# If bundleAttempt1 failed, try again here; Otherwise skip.
97-
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
97+
if: ${{ steps.bundleAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
9898
run: bundle
9999

100100
- name: "[Attempt 1] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
@@ -108,7 +108,7 @@ jobs:
108108
- name: "[Attempt 2] Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}"
109109
id: bundleAppraisalAttempt2
110110
# If bundleAppraisalAttempt1 failed, try again here; Otherwise skip.
111-
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (env.ACT && !(startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) || (!env.ACT && (startsWith(matrix.ruby, 'jruby')) || startsWith(matrix.ruby, 'truffleruby')) }}
111+
if: ${{ steps.bundleAppraisalAttempt1.outcome == 'failure' && (!env.ACT || (! startsWith(matrix.ruby, 'jruby') && !startsWith(matrix.ruby, 'truffleruby'))) }}
112112
run: bundle exec appraisal ${{ matrix.appraisal }} bundle
113113

114114
- name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}

0 commit comments

Comments
 (0)