Skip to content

Commit

Permalink
Merge pull request #35 from oblivioncth/dev
Browse files Browse the repository at this point in the history
Merge to master for v0.2.0.1 hotfix
  • Loading branch information
oblivioncth authored Jan 2, 2023
2 parents 4881076 + e9af62a commit 3d1a5fa
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-starpp-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
required: true
outputs:
qt_shared_artifact_name:
description: "Qx (Qt shared) build artifact"
description: "STARpp (Qt shared) build artifact"
value: ${{ jobs.build-starpp.outputs.qt_shared_artifact_name }}
qt_static_artifact_name:
description: "STARpp (Qt static) build artifact"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-starpp-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
required: true
outputs:
qt_shared_artifact_name:
description: "Qx (Qt shared) build artifact"
description: "STARpp (Qt shared) build artifact"
value: ${{ jobs.build-starpp.outputs.qt_shared_artifact_name }}
qt_static_artifact_name:
description: "STARpp (Qt static) build artifact"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/master-pull-request-merge-reaction.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
echo "release_qts_win_package_name=${{ needs.build_starpp_release_windows.outputs.qt_static_artifact_name }}" >> $Env:GITHUB_ENV
echo "release_qtd_linux_package_name=${{ needs.build_starpp_release_linux.outputs.qt_shared_artifact_name }}" >> $Env:GITHUB_ENV
echo "release_qts_linux_package_name=${{ needs.build_starpp_release_linux.outputs.qt_static_artifact_name }}" >> $Env:GITHUB_ENV
- name: Download built shared Qx artifact (Windows)
- name: Download built shared STARpp artifact (Windows)
uses: actions/download-artifact@v3
with:
name: ${{ env.release_qtd_win_package_name }}
Expand All @@ -102,7 +102,7 @@ jobs:
with:
name: ${{ env.release_qts_win_package_name }}
path: ${{ env.starpp_qts_win_artifact_path }}
- name: Download built shared Qx artifact (Linux)
- name: Download built shared STARpp artifact (Linux)
uses: actions/download-artifact@v3
with:
name: ${{ env.release_qtd_linux_package_name }}
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ option(STARPP_DOCS "Build STAR++ documentation" OFF)
# Project
# NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
project(STARpp
VERSION 0.2
VERSION 0.2.0.1
LANGUAGES CXX
DESCRIPTION "C++ implementation of STAR voting"
)
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# STAR++
<img align="left" src="https://i.imgur.com/RAGGXwJ.png" width=25%>

STAR++ is an implementation of the [STAR voting method](https://www.starvoting.org/).

It exists as a CMake consumable library and reference command-line application that demonstrates use of the library.
Expand Down Expand Up @@ -82,7 +83,7 @@ Using no calculator options will result in the application following the recomme
### Summary

- C++20
- CMake >= 3.24.0
- CMake >= 3.25.0
- Targets:
- Windows 10+
- Linux (Tested on Ubuntu 20.04)
Expand Down

0 comments on commit 3d1a5fa

Please sign in to comment.