From 94a011b9f7c0a991e5382927a2dbe5a7d9a056b8 Mon Sep 17 00:00:00 2001 From: Gulliver Date: Sat, 18 May 2024 20:18:01 +0200 Subject: [PATCH] set version to 1.2 and build to build on branch only --- .github/workflows/build_and_test.yml | 5 +---- .github/workflows/doxygen-gh-pages.yml | 6 ++---- CMakeLists.txt | 2 +- docs/versions.json | 1 + 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index cd8978064..a5833419d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -1,11 +1,8 @@ name: Build and test -#on: push on: push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] + branches: [ "v1.2" ] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml index e6bfe4006..119bc7e21 100644 --- a/.github/workflows/doxygen-gh-pages.yml +++ b/.github/workflows/doxygen-gh-pages.yml @@ -1,10 +1,8 @@ name: Deploy Doxygen results to Github Pages -#on: push on: push: - branches: - - master + branches: [ "v1.2" ] permissions: contents: write @@ -36,4 +34,4 @@ jobs: - name: run mike (Deploy 🚀) run: | git fetch origin gh-pages --depth=1 - mike deploy master --push + mike deploy 1.2 --push diff --git a/CMakeLists.txt b/CMakeLists.txt index f02d9c489..6c1dfc923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.15.0 FATAL_ERROR) # Define the project name and language project(Crow LANGUAGES CXX - VERSION 1.1.1 + VERSION 1.2.0 ) # Make sure Findasio.cmake module is found diff --git a/docs/versions.json b/docs/versions.json index a0ea4c5b0..9e56addec 100644 --- a/docs/versions.json +++ b/docs/versions.json @@ -1,5 +1,6 @@ [ {"version": "master", "title": "master", "aliases": []}, + {"version": "1.2", "title": "1.2.0", "aliases": []}, {"version": "1.1", "title": "1.1.0", "aliases": []}, {"version": "1.0", "title": "1.0+3", "aliases": []}, {"version": "0.3", "title": "0.3+4", "aliases": []}