flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change default branch name to main

Browse Source
This commit is contained in:
Lars Toenning
2023-04-07 11:03:02 +02:00
committed by Mat Sutcliffe
parent d151f9ffff
commit b4baa936d6
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build.yml vendored
View File

@@ -5,7 +5,6 @@ on:
branches-ignore: branches-ignore:
- stable/** - stable/**
- nobuild/** - nobuild/**
- readthedocs
pull_request: pull_request:
concurrency: concurrency:
@@ -14,7 +13,7 @@ concurrency:
env: env:
do_vatsim_key: ${{ github.event_name == 'push' }} do_vatsim_key: ${{ github.event_name == 'push' }}
do_symbols: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/develop/') }} do_symbols: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
qt_version: 5.15.2 qt_version: 5.15.2
bitrock_version: qt-professional-23.1.0 bitrock_version: qt-professional-23.1.0
bitrock_url: https://releases.bitrock.com/installbuilder bitrock_url: https://releases.bitrock.com/installbuilder
@@ -427,7 +426,7 @@ jobs:
release: release:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
needs: [preBuild, postBuild] needs: [preBuild, postBuild]
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/develop/') }} if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
outputs: outputs:
id: ${{ steps.create.outputs.release_id }} id: ${{ steps.create.outputs.release_id }}

5
README.md
View File

@@ -35,12 +35,11 @@ Contributing
_swift_ is written in modern C++17 using the Qt framework. _swift_ is written in modern C++17 using the Qt framework.
[![Development version](https://img.shields.io/badge/version-0.12-blue)](.) [![Development version](https://img.shields.io/badge/version-0.12-blue)](.)
[![Build status](https://img.shields.io/github/actions/workflow/status/swift-project/pilotclient/build.yml?branch=develop/0.12)][3] [![Build status](https://img.shields.io/github/actions/workflow/status/swift-project/pilotclient/build.yml?branch=main)][3]
[3]: https://github.com/swift-project/pilotclient/actions [3]: https://github.com/swift-project/pilotclient/actions
Pull requests should be made against the current active development branch, Pull requests should be made against the `main` branch.
which is `develop/0.12`.
[:blue_book: Developer guide](https://docs.swift-project.org/doku.php?id=developer_documentation) [:blue_book: Developer guide](https://docs.swift-project.org/doku.php?id=developer_documentation)