Skip to content

Commit

Permalink
Submodules update, Tiberius to release (#146)
Browse files Browse the repository at this point in the history
* Update Fronter

* Update cpp-base64

* Update googletest

* Update CK3RegionTests.cpp

* Tiberius to release

* Tiberius to release

* Create 0_2_ReleaseBanner.xcf

* Update appveyor.yml

* Create bump_version.yml

* Output commit id in log
  • Loading branch information
IhateTrains authored Mar 6, 2021
1 parent 41c42be commit 4987940
Show file tree
Hide file tree
Showing 12 changed files with 45 additions and 16 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/bump_version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Bump version
on:
push:
branches:
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: '0'
- name: Bump version and push tag
uses: anothrNick/github-tag-action@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BUMP: minor
2 changes: 1 addition & 1 deletion Fronter
2 changes: 2 additions & 0 deletions ImperatorToCK3/Copy_Files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ cp -r "Data_Files/configurables" "Release-Linux/"
# Copy blankmod
rm -rf "Release-Linux/blankMod"
cp -r "Data_Files/blankMod" "Release-Linux/"

git rev-parse HEAD > ..\Release\commit_id.txt
4 changes: 3 additions & 1 deletion ImperatorToCK3/Copy_Files_Debug.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ echo on
rem Create Blank Mod
del "..\Debug\ImperatorToCK3\blankMod" /Q
rmdir "..\Debug\ImperatorToCK3\blankMod" /S /Q
xcopy "Data_Files\blankMod" "..\Debug\ImperatorToCK3\blankMod" /Y /E /I
xcopy "Data_Files\blankMod" "..\Debug\ImperatorToCK3\blankMod" /Y /E /I

git rev-parse HEAD > ..\Release\commit_id.txt
4 changes: 3 additions & 1 deletion ImperatorToCK3/Copy_Files_Release.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ echo on
rem Create Blank Mod
del "..\Release\ImperatorToCK3\blankMod" /Q
rmdir "..\Release\ImperatorToCK3\blankMod" /S /Q
xcopy "Data_Files\blankMod" "..\Release\ImperatorToCK3\blankMod" /Y /E /I
xcopy "Data_Files\blankMod" "..\Release\ImperatorToCK3\blankMod" /Y /E /I

git rev-parse HEAD > ..\Release\commit_id.txt
2 changes: 0 additions & 2 deletions ImperatorToCK3/Data_Files/configurables/version.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Version info

version = "0.2"
name = "Tiberius-prerelease"
descriptionLine = "Compatible with I:R 1.5 and CK3 1.1"
Binary file not shown.
9 changes: 8 additions & 1 deletion ImperatorToCK3/Source/CK3Outputter/outVersion.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
#include "outVersion.h"
#include "Mappers/VersionParser/VersionParser.h"
#include <fstream>



std::ostream& mappers::operator<<(std::ostream& output, const VersionParser& versionParser) {
// read commit id
std::string commitID;
std::ifstream commitIdFile{ "../commit_id.txt" };
commitIdFile >> commitID;
commitIdFile.close();

output << "\n\n";
output << "************ -= The Paradox Converters Team =- ********************\n";
output << "* Converter version " << versionParser.version << " \"" << versionParser.name << "\"\n";
output << "* Converter build based on commit " << commitID << "\"\n";
output << "* " << versionParser.descriptionLine << "\n";
output << "* Built on " << __TIMESTAMP__ << "\n";
output << "*********** + Imperator: Rome To Crusader Kings III + **************\n";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#include "gtest/gtest.h"
#include <sstream>



TEST(Mappers_RegionTests, blankRegionLoadsWithNoRegionsAndNoDuchies)
{
std::stringstream input;
Expand Down Expand Up @@ -61,9 +63,9 @@ TEST(Mappers_RegionTests, regionCanBeLinkedToDuchy)
auto duchy2 = std::make_shared<CK3::Title>("d_athens");
duchy2->loadTitles(input2);

ASSERT_EQ(nullptr, region.getDuchies().find("d_athens")->second); // nullptr before linking
ASSERT_FALSE(region.getDuchies().at("d_athens")); // nullptr before linking
region.linkDuchy(duchy2);
ASSERT_TRUE(region.getDuchies().find("d_athens")->second);
ASSERT_TRUE(region.getDuchies().at("d_athens"));
}

TEST(Mappers_RegionTests, LinkedRegionCanLocateProvince)
Expand Down
11 changes: 5 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
version: ImperatorToCK3.{build}
skip_tags: true
image: Visual Studio 2019 Preview
configuration: Release
build_script:
Expand All @@ -18,14 +17,14 @@ test_script:
$wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\tests.xml))
artifacts:
- path: Release
name: ImperatorToCK3-0.2-prerelease
name: ImperatorToCK3
deploy:
- provider: GitHub
release: windows_development_build
description: The most recent build of the development version
tag: $(APPVEYOR_REPO_TAG_NAME)
description: Stable release
auth_token:
secure: LBJzs4y9j0N5y0ajp7gmVk3Pvnec1UU5pTCdIMbQYUddEXQnWTJ79FXsd9SCs7YQ
repository: ParadoxGameConverters/ImperatorToCK3
artifact: ImperatorToCK3-0.2-prerelease
prerelease: true
artifact: ImperatorToCK3
prerelease: false
force_update: true
2 changes: 1 addition & 1 deletion cpp-base64
Submodule cpp-base64 updated 1 files
+6 −1 test.cpp
2 changes: 1 addition & 1 deletion googletest
Submodule googletest updated 130 files

0 comments on commit 4987940

Please sign in to comment.