diff options
| author | Benoit Daloze <eregontp@gmail.com> | 2020-02-17 15:02:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 15:02:19 +0100 |
| commit | bb8a35ef7e45654ce3e57c9154da014432a46d13 (patch) | |
| tree | e77c84936ac4614b01a78d483d50e20da0efe529 | |
| parent | da136f103e8eb53bda6c0c3db657ca95f11de541 (diff) | |
| parent | fcafe246f78b00d4ef17fc05225322bc619111c7 (diff) | |
| download | psych-bb8a35ef7e45654ce3e57c9154da014432a46d13.zip | |
Merge pull request #432 from MSP-Greg/actions-update
Update Actions
| -rw-r--r-- | .github/workflows/macos.yml | 20 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 27 | ||||
| -rw-r--r-- | .github/workflows/windows.yml | 34 | ||||
| -rw-r--r-- | appveyor.yml | 2 |
4 files changed, 44 insertions, 39 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7d20478..336b691 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -5,11 +5,17 @@ on: [push, pull_request] jobs: build: runs-on: macos-latest + strategy: + fail-fast: false + matrix: + ruby: [ 2.7, 2.6, 2.5, 2.4 ] steps: - - uses: actions/checkout@master - - name: Install dependencies - run: | - gem install bundler --no-document - bundle install - - name: Run test - run: rake + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Install dependencies + run: bundle install + - name: Run test + run: rake diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index aae178f..efd01ea 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -6,19 +6,18 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - ruby: [ '2.6', '2.5', '2.4', 'ruby-head'] + ruby: [ ruby-head, 2.7, 2.6, 2.5, 2.4 ] steps: - - name: Install libraries - run: sudo apt install haveged - - uses: actions/checkout@master - - name: Set up Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Install dependencies - run: | - gem install bundler --no-document - bundle install - - name: Run test - run: rake + - name: Install libraries + run: sudo apt install haveged + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + - name: Install dependencies + run: bundle install + - name: Run test + run: rake diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 89b2443..1e11460 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -8,20 +8,22 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ '2.6.x', '2.5.x', '2.4.x' ] + ruby: [ mingw, mswin, 2.7, 2.6, 2.5, 2.4 ] steps: - - uses: actions/checkout@master - - name: Set up Ruby - uses: actions/setup-ruby@v1 - with: - ruby-version: ${{ matrix.ruby }} - - name: Update MSYS2 - uses: MSP-Greg/msys2-action@master - with: - base: update - - name: Install dependencies - run: | - gem update --system --no-document --conservative - bundle install - - name: Run test - run: rake + - uses: actions/checkout@v2 + - name: Set up Ruby + uses: MSP-Greg/actions-ruby@v1 + with: + ruby-version: ${{ matrix.ruby }} + base: update + - name: Install dependencies + run: bundle install + - name: Run test + if: matrix.ruby != 'mswin' + run: rake + - name: Run test + if: matrix.ruby == 'mswin' + shell: cmd + run: | + call "%VCVARS%" + rake diff --git a/appveyor.yml b/appveyor.yml index 90ed36c..9679fe4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,6 +11,4 @@ deploy: off environment: matrix: - ruby_version: "24" - - ruby_version: "24-x64" - ruby_version: "25" - - ruby_version: "25-x64" |