Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/github-script@v7
- uses: actions/checkout@v6
- uses: actions/github-script@v9
with:
script: |
await github.rest.repos.merge({
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,21 @@ on:
- master
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}

jobs:
cancel-previous-runs:
runs-on: ubuntu-latest
steps:
- uses: styfle/cancel-workflow-action@0.12.1
with:
access_token: ${{ github.token }}

test-both-actions-and-package:
needs: cancel-previous-runs
strategy:
fail-fast: false
matrix:
st-version: [3, 4]
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: "./actions/setup"
with:
sublime-text-version: ${{ matrix.st-version }}
Expand All @@ -41,44 +38,41 @@ jobs:
token: ${{secrets.CODECOV_TOKEN}}

test-actions: # with latest released unittesting
needs: cancel-previous-runs
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: "./actions/setup"
with:
install-package: false
- uses: "./actions/run-tests"

test-package: # with v1 actions
needs: cancel-previous-runs
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- uses: SublimeText/UnitTesting/actions/setup@v1
- uses: SublimeText/UnitTesting/actions/run-tests@v1

test-as-extra-package:
needs: cancel-previous-runs
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
repository: randy3k/UnitTesting-example
path: UnitTesting-example
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
path: UnitTesting
- uses: "./UnitTesting/actions/setup"
Expand Down
Loading