Update branches in workflows and README.md
This commit is contained in:
parent
426bb999c5
commit
9c6a8814bd
|
@ -3,10 +3,10 @@
|
|||
name: Danger
|
||||
|
||||
# Controls when the action will run. Triggers the workflow on push or pull request
|
||||
# events but only for the master branch
|
||||
# events but only for the main branch
|
||||
on:
|
||||
pull_request:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
|
||||
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
|
||||
jobs:
|
||||
|
|
|
@ -2,9 +2,9 @@ name: Build and test
|
|||
|
||||
on:
|
||||
push:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
pull_request:
|
||||
branches: [master]
|
||||
branches: [main]
|
||||
|
||||
jobs:
|
||||
macos_build:
|
||||
|
|
14
README.md
14
README.md
|
@ -2,19 +2,19 @@
|
|||
|
||||
## SwiftUI-compatible framework for building browser apps with WebAssembly
|
||||
|
||||
[![Build Status](https://dev.azure.com/max0484/max/_apis/build/status/MaxDesiatov.Tokamak?branchName=master)](https://dev.azure.com/max0484/max/_build/latest?definitionId=3&branchName=master)
|
||||
[![Coverage](https://img.shields.io/codecov/c/github/MaxDesiatov/Tokamak/master.svg?style=flat)](https://codecov.io/gh/maxdesiatov/Tokamak)
|
||||
[![Build Status](https://dev.azure.com/max0484/max/_apis/build/status/MaxDesiatov.Tokamak?branchName=main)](https://dev.azure.com/max0484/max/_build/latest?definitionId=3&branchName=main)
|
||||
[![Coverage](https://img.shields.io/codecov/c/github/MaxDesiatov/Tokamak/main.svg?style=flat)](https://codecov.io/gh/maxdesiatov/Tokamak)
|
||||
|
||||
The WebAssembly/DOM renderer built for [SwiftWasm](https://swiftwasm.org)
|
||||
is not ready yet. The reconciler and the test renderer already expose a
|
||||
SwiftUI API, but the actual DOM renderer is currently blocked by [a few SwiftWasm
|
||||
SwiftUI API, but the actual DOM renderer is currently blocked by [a few SwiftWasm
|
||||
issues](https://github.com/swiftwasm/swift/issues/597).
|
||||
|
||||
## Acknowledgments
|
||||
|
||||
* Thanks to the [Swift community](https://swift.org/community/) for
|
||||
- Thanks to the [Swift community](https://swift.org/community/) for
|
||||
building one of the best programming languages available!
|
||||
* Thanks to [SwiftWebUI](https://github.com/SwiftWebUI/SwiftWebUI),
|
||||
- Thanks to [SwiftWebUI](https://github.com/SwiftWebUI/SwiftWebUI),
|
||||
[Render](https://github.com/alexdrone/Render),
|
||||
[ReSwift](https://github.com/ReSwift/ReSwift), [Katana
|
||||
UI](https://github.com/BendingSpoons/katana-ui-swift) and
|
||||
|
@ -23,7 +23,7 @@ issues](https://github.com/swiftwasm/swift/issues/597).
|
|||
## Contributing
|
||||
|
||||
This project adheres to the [Contributor Covenant Code of
|
||||
Conduct](https://github.com/MaxDesiatov/Tokamak/blob/master/CODE_OF_CONDUCT.md).
|
||||
Conduct](https://github.com/MaxDesiatov/Tokamak/blob/main/CODE_OF_CONDUCT.md).
|
||||
By participating, you are expected to uphold this code. Please report
|
||||
unacceptable behavior to conduct@tokamak.dev.
|
||||
|
||||
|
@ -34,5 +34,5 @@ unacceptable behavior to conduct@tokamak.dev.
|
|||
## License
|
||||
|
||||
Tokamak is available under the Apache 2.0 license. See the
|
||||
[LICENSE](https://github.com/MaxDesiatov/Tokamak/blob/master/LICENSE) file for
|
||||
[LICENSE](https://github.com/MaxDesiatov/Tokamak/blob/main/LICENSE) file for
|
||||
more info.
|
||||
|
|
Loading…
Reference in New Issue