Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Bump dev version to 1.6.0. #1886

Merged
merged 2 commits into from
May 7, 2024
Merged

build: Bump dev version to 1.6.0. #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fb49a2
Bump dev version to 1.6.0.
trisyoungs May 1, 2024
911879d
Checkout PR on head SHA rather than merge commit.
trisyoungs May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup
uses: "./.github/workflows/setup"
- name: Quality Control
Expand All @@ -37,6 +39,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup
uses: "./.github/workflows/setup"
- name: Set Short Hash
Expand All @@ -53,6 +57,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup
uses: "./.github/workflows/setup"
- name: Set Short Hash
Expand All @@ -72,6 +78,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup
uses: "./.github/workflows/setup"
- name: "Package (${{ matrix.os }})"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ project(Dissolve)
set(DESCRIPTION "Dissolve")
set(AUTHOR "Team Dissolve")
set(VERSION_MAJOR "1")
set(VERSION_MINOR "5")
set(VERSION_MINOR "6")
set(VERSION_PATCH "0")

if(NOT CMAKE_BUILD_TYPE)
Expand Down
4 changes: 2 additions & 2 deletions ci/windows/dissolve-gui.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Dissolve-GUI"
#define MyAppVersion "1.5.0"
#define MyAppVersion "1.6.0"
#define MyAppPublisher "Team Dissolve"
#define MyAppURL "https://www.projectdissolve.com/"
#define MyAppExeName "Dissolve-GUI.exe"
Expand Down Expand Up @@ -31,7 +31,7 @@ DefaultDirName={commonpf}\Dissolve-GUI
DefaultGroupName={#MyAppName}
LicenseFile=..\..\LICENSE.txt
OutputDir=..\..\
OutputBaseFilename=Dissolve-GUI-1.5.0-Win64
OutputBaseFilename=Dissolve-GUI-1.6.0-Win64
SetupIconFile=Dissolve.ico
Compression=lzma
SolidCompression=yes
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
else
(if gui then "dissolve-gui" else "dissolve");
cmake-bool = x: if x then "ON" else "OFF";
version = "1.5.0";
version = "1.6.0";
base_libs = pkgs:
with pkgs; [
antlr4
Expand Down
2 changes: 1 addition & 1 deletion src/main/version.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <fmt/format.h>
#include <iostream>

#define DISSOLVEVERSION "1.5.0"
#define DISSOLVEVERSION "1.6.0"
#define DISSOLVESHORTHASH ""
#define DISSOLVEREPO "https://github.com/disorderedmaterials/dissolve.git"

Expand Down