Skip to content
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

Change all references to macOS #1301

Merged
merged 1 commit into from
Feb 10, 2020
Merged

Change all references to macOS #1301

merged 1 commit into from
Feb 10, 2020

Conversation

dwijnand
Copy link
Member

Change all references to macOS (MacOS X, MacOSX, OS X, OSX, macOSx, macosx, osx).

That leaves the TRAVIS_OS_NAME env var, which seems to only supports
the variant 'osx', as far as I can tell.

It also leaves the packageOsxDmg/package-osx-dmg task key, that is
both public binary API and public semantic API, as keys are global in
sbt's build state - so I just left it as is for now.

@dwijnand
Copy link
Member Author

Hehe, there's a branch protection status check rule on scripted-osx, so this is going to be perma-pending on that, I predict.

Change all references to macOS (MacOS X, MacOSX, OS X, OSX, macOSx, macosx, osx).

That leaves the `TRAVIS_OS_NAME` env var, which seems to only supports
the variant 'osx', as far as I can tell.

It also leaves the `packageOsxDmg`/`package-osx-dmg` task key, that is
both public binary API and public semantic API, as keys are global in
sbt's build state - so I just left it as is for now.
@dwijnand
Copy link
Member Author

For the record, scripted-macos passed (https://github.com/sbt/sbt-native-packager/pull/1301/checks?check_run_id=417762763)

The AppVeyor failure seems unrelated to this?

[info] [error] (checkScript) java.lang.AssertionError: assertion failed: 
[info] [error] ---------------------------------
[info] [error] with -D
[info] [error] ---------------------------------
[info] [error] Failed to correctly run the main script!.
[info] [error] "cmd" "/c" "C:\Users\appveyor\AppData\Local\Temp\1\sbt_2677ef49\test-bat-template\target\universal\stage\bin\windows-test.bat -Dtest.hoge="huga" OK"
[info] [error] cmdcmdline="cmd" /c "C:\Users\appveyor\AppData\Local\Temp\1\sbt_2677ef49\test-bat-template\target\universal\stage\bin\windows-test.bat -Dtest.hoge=\"huga\" OK"
[info] [error] *=-Dtest.hoge=\"huga\" OK
[info] [error] %1=-Dtest.hoge
[info] [error] %2=\"huga\"
[info] [error] %3=OK
[info] [error] %4=
[info] [error] %5=
[info] [error] %6=
[info] [error] %7=
[info] [error] %8=
[info] [error] %9=
[info] [error] _JAVA_OPTS=
[info] [error] _APP_ARGS=
[info] [error] --return code---------------------------
[info] [error] 
[info] [error] got: 0, expected: 0
[info] [error] 
[info] [error] --expected----------------------------
[info] [error] arg #0 is [OK]
[info] [error] property(test.hoge) is [huga]
[info] [error] SUCCESS!
[info] [error] 
[info] [error] --found-------------------------------
[info] [error] arg #0 is [OK]
[info] [error] property(test.hoge) is ["huga"]
[info] [error] SUCCESS!
[info] [error] 
[info] [error] --detail-------------------------------
[info] [error] C:\Users\appveyor\AppData\Local\Temp\1\sbt_2677ef49\test-bat-template>echo on   & prompt $g  
...

@muuki88 muuki88 added the macosx label Feb 10, 2020
@muuki88
Copy link
Contributor

muuki88 commented Feb 10, 2020

Thanks for your pull request 🤗

Hehe, there's a branch protection status check rule on scripted-osx, so this is going to be perma-pending on that, I predict.

Where did you see this 😮 I haven't found anything in the project settings.

@muuki88
Copy link
Contributor

muuki88 commented Feb 10, 2020

Yeah. The appveyor build is broken since a few days / weeks. I haven't had the time yet to look into it.

@muuki88 muuki88 merged commit c8b3d1f into sbt:master Feb 10, 2020
@dwijnand dwijnand deleted the macOS branch February 10, 2020 14:19
@dwijnand
Copy link
Member Author

Where did you see this 😮 I haven't found anything in the project settings.

https://github.com/sbt/sbt-native-packager/settings/branch_protection_rules/406757

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

Successfully merging this pull request may close these issues.

2 participants