diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e773b97f6..59bcd82d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,6 @@ on: branches-ignore: - stable/** - nobuild/** - - readthedocs pull_request: concurrency: @@ -14,7 +13,7 @@ concurrency: env: 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 bitrock_version: qt-professional-23.1.0 bitrock_url: https://releases.bitrock.com/installbuilder @@ -427,7 +426,7 @@ jobs: release: runs-on: ubuntu-20.04 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: id: ${{ steps.create.outputs.release_id }} diff --git a/README.md b/README.md index 5b80d57a8..976046042 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,11 @@ Contributing _swift_ is written in modern C++17 using the Qt framework. [![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 -Pull requests should be made against the current active development branch, -which is `develop/0.12`. +Pull requests should be made against the `main` branch. [:blue_book: Developer guide](https://docs.swift-project.org/doku.php?id=developer_documentation)