Skip to content

Commit

Permalink
Merge branch 'main' into landau/plugins-unify
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeland73 committed Feb 26, 2024
2 parents a7d0dbe + 1500961 commit 5e804f2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/cli-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ permissions:
jobs:
tests:
uses: ./.github/workflows/cli-tests.yaml
with:
# This will run the basic testscript unit tests on MacOS.
# NOTE: cli-tests will NEVER run project-tests on MacOS.
run-mac-tests: true

report-test-failures:
runs-on: ubuntu-latest
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/cli-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ on:
example-debug:
type: boolean
description: Run example tests with DEVBOX_DEBUG=1 to increase verbosity
schedule:
- cron: '30 8 * * *' # Run nightly at 8:30 UTC

permissions:
contents: read
Expand Down Expand Up @@ -116,12 +118,9 @@ jobs:
# 2. latest nix version (note, 2.20.1 introduced a new profile change)
nix-version: ["2.12.0", "2.19.2", "2.20.1"]
exclude:
# Dont run mac tests on not-main unless explicitly requested.
- is-main: "not-main"
os: "${{ inputs.run-mac-tests && 'dummy' || 'macos-latest' }}"
# Only runs project tests on macos if explicitly requested
- run-project-tests: "project-tests-only"
os: "${{ inputs.run-mac-tests && 'dummy' || 'macos-latest' }}"
# Only runs tests on macos if explicitly requested, or on a schedule
- os: "${{ (inputs.run-mac-tests || github.event.schedule != '') && 'dummy' || 'macos-latest' }}"


runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down

0 comments on commit 5e804f2

Please sign in to comment.