Skip to content

Commit 85b5f6a

Browse files
authored
Merge pull request #98 from opal/staging
Make Opal v1.5 the primary GHA target
2 parents 4ff0255 + 4fca756 commit 85b5f6a

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,13 @@ jobs:
1717
combo:
1818
- name: Chromium/Linux/Opal-master
1919
opal: master
20+
- name: Chromium/Linux/Opal-1.5
21+
opal: 1.5
22+
- name: Chromium/Linux/Opal-1.5/PromiseV2
23+
opal: 1.5
24+
promise: v2
2025
- name: Chromium/Linux/Opal-1.4
2126
opal: 1.4
22-
- name: Chromium/Linux/Opal-1.4/PromiseV2
23-
opal: 1.4
24-
promise: v2
2527
- name: Chromium/Linux/Opal-1.3
2628
opal: 1.3
2729
- name: Chromium/Linux/Opal-1.0
@@ -59,7 +61,7 @@ jobs:
5961
- uses: actions/checkout@v2
6062
- name: set environment variables
6163
run: |
62-
echo "OPAL_VERSION=${{ matrix.combo.opal || '1.4' }}" >> $GITHUB_ENV
64+
echo "OPAL_VERSION=${{ matrix.combo.opal || '1.5' }}" >> $GITHUB_ENV
6365
echo "OPAL_BROWSER_PROMISE=${{ matrix.combo.promise || 'v1' }}" >> $GITHUB_ENV
6466
- uses: ruby/setup-ruby@v1
6567
with:
@@ -68,11 +70,11 @@ jobs:
6870
- uses: actions/cache@v2
6971
with:
7072
path: ./vendor/bundle
71-
key: ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.4' }}-${{ github.ref }}-${{ hashFiles('**/Gemfile.lock') }}
73+
key: ${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.5' }}-${{ github.ref }}-${{ hashFiles('**/Gemfile.lock') }}
7274
restore-keys: |
73-
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.4' }}-${{ github.ref }}
74-
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.4' }}-master
75-
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.4' }}-
75+
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.5' }}-${{ github.ref }}
76+
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.5' }}-master
77+
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-${{ matrix.combo.opal || '1.5' }}-
7678
${{ runner.os }}-${{ matrix.combo.ruby || '3.0' }}-gems-
7779
- name: bundle install
7880
run: |

0 commit comments

Comments
 (0)