Skip to content

Skip fast Windows job for master merges #10556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 30, 2020

Conversation

liufengyun
Copy link
Contributor

@liufengyun liufengyun commented Nov 30, 2020

Skip fast Windows job for master merges

As the full Windows job is a superset

[skip ci]

As the full Windows job is a superset
@nicolasstucki nicolasstucki merged commit 31751b9 into scala:master Nov 30, 2020
@nicolasstucki nicolasstucki deleted the fix-windows-ci branch November 30, 2020 16:29
@griggt
Copy link
Contributor

griggt commented Nov 30, 2020

AFAICT this PR doesn't do what it is intended to do, both test_windows_fast and test_windows_full ran when this was merged.

I believe this is the desired change:

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6a98564606..f0971596f4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -93,7 +93,7 @@ jobs:
     runs-on: [self-hosted, Windows]
     if: "(
            github.event_name == 'push'
-           && github.ref != 'master'
+           && github.ref != 'refs/heads/master'
            && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')
          )
          || (

@liufengyun
Copy link
Contributor Author

Thanks for the catch @griggt , I made a new PR in #10566.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants