Merge pull request #110 from post-kerbin-mining-corporation/dev

Release
post-kerbin-mining-corporation · Dec 20, 2020 · c86ac76 · c86ac76
2 parents 83cfc79 + 5f1d62b
commit c86ac76
Show file tree

Hide file tree

Showing 9 changed files with 136 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,43 @@
+name: build
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -0,0 +1,47 @@
+name: deploy
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  deploy-package:
+    env:
+      AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checkout this repo
+    - uses: actions/checkout@v2
+    # Checkout another repo
+    - uses: actions/checkout@v2
+      with:
+        # Repository name with owner.
+        repository: 'post-kerbin-mining-corporation/build-deploy'
+        # branch
+        ref: 'actions'
+        path: 'build-deploy'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8' 
+        architecture: 'x64' 
+    - name: Installing dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest awscli boto3 requests
+    #- name: Running deploy tests
+    #  run: pytest -s --testpath "GameData/" build-deploy/src/tests/  # run the deploy tests
+    - name: Building package
+      run: python build-deploy/src/package.py --f ".mod_data.yml"  
+    - name: Staging package
+      run: python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
+    - name: Deploying package
+      run: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github
diff --git a/.ksp_deploy_config.yml b/.ksp_deploy_config.yml
@@ -0,0 +1,3 @@
+OAUTH_TOKEN_SSM_KEY: pkmc-bot-github-oauth-token
+GITHUB_USER_SSM_KEY: pkmc-bot-github-user
+GITHUB_USER_EMAIL_SSM_KEY: pkmc-bot-github-user-email
diff --git a/.mod_data.yml b/.mod_data.yml
@@ -17,9 +17,9 @@ dependencies:  # Configure dependencies
     version: 1.4.1
     location: s3
   DynamicBatteryStorage:
-    tag: 2.1.10
+    tag: 2.2.1
     location: github
-    repository: ChrisAdderley/DynamicBatteryStorage
+    repository: post-kerbin-mining-corporation/DynamicBatteryStorage
 deploy:
   SpaceDock:
     enabled: false  # activate/deactivate this deployment script

diff --git a/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg b/GameData/CryoTanks/Patches/CryoTanksModularFuelTanks.cfg
@@ -24,7 +24,7 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels]
     }
 	 TANK
     {
-        name = Monopropellant
+        name = MonoPropellant
         amount = 0.0
         maxAmount = 0.0
     }
@@ -92,4 +92,28 @@ TANK_DEFINITION:NEEDS[ModularFuelTanks&!RealFuels]
 		}
 	}
 }
+// Adds ModuleCryoTank to CryoTanks included built in ZBO tanks. Without MFT installed, this is provided in the FuelTankSwitcherConfig
+@PART[hydrogen-*]:HAS[@RESOURCE[LqdHydrogen]]
+{
+MODULE
+	{
+		name =  ModuleCryoTank
+		// in Ec per 1000 units per second
+		CoolingEnabled = True
+		BOILOFFCONFIG
+		{
+			FuelName = LqdHydrogen
+			// in % per hr
+			BoiloffRate = 0.05
+			CoolingCost = 0.05
+		}
+    BOILOFFCONFIG
+		{
+			FuelName = LqdMethane
+			// in % per hr
+			BoiloffRate = 0.005
+			CoolingCost = 0.02
+		}
+	}
+}
 
diff --git a/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg b/GameData/CryoTanks/Patches/CryoTanksProceduralWings.cfg
@@ -1,4 +1,4 @@
-@ProceduralWingFuelSetups:NEEDS[CryoTanks&B9_Aerospace_WingStuff|pWings]
+@ProceduralWingFuelSetups:NEEDS[CryoTanks&B9_Aerospace_WingStuff|pWings&!ModularFuelTanks]
 {
 	FuelSet
 	{
@@ -25,7 +25,7 @@
 	}
 }
 
-@PART[B9_Aero_Wing_Procedural_TypeA,Proceduralwing*]:NEEDS[CryoTanks]
+@PART[B9_Aero_Wing_Procedural_TypeA,Proceduralwing*]:NEEDS[CryoTanks&!ModularFuelTanks]
 {
 	MODULE
 	{

diff --git a/GameData/CryoTanks/Versioning/CryoTanks.version b/GameData/CryoTanks/Versioning/CryoTanks.version
@@ -1,19 +1,19 @@
 {
     "NAME":"CryoTanks",
-    "URL":"https://raw.githubusercontent.com/ChrisAdderley/CryoTanks/master/GameData/CryoTanks/Versioning/CryoTanks.version",
-    "DOWNLOAD":"https://github.com/ChrisAdderley/CryoTanks/releases",
+    "URL":"https://raw.githubusercontent.com/post-kerbin-mining-corporation/CryoTanks/master/GameData/CryoTanks/Versioning/CryoTanks.version",
+    "DOWNLOAD":"https://github.com/post-kerbin-mining-corporation/CryoTanks/releases",
     "VERSION":
     {
         "MAJOR":1,
         "MINOR":5,
-        "PATCH":3,
+        "PATCH":4,
         "BUILD":0
     },
     "KSP_VERSION":
     {
         "MAJOR":1,
-        "MINOR":10,
-        "PATCH":1
+        "MINOR":11,
+        "PATCH":0
     },
     "KSP_VERSION_MIN":{
         "MAJOR":1,
@@ -22,7 +22,7 @@
     },
     "KSP_VERSION_MAX":{
         "MAJOR":1,
-        "MINOR":10,
+        "MINOR":11,
         "PATCH":99
     }
 }
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,9 @@
+v1.5.4
+------
+- KSP 1.11
+- Updated DynamicBatteryStorage to 2.2.1
+- Various MFT fixes by dlrk
+
 v1.5.3
 ------
 - Updated DynamicBatteryStorage to 2.1.10

diff --git a/readme.txt b/readme.txt
@@ -1,5 +1,5 @@
 =================
-Cryo Tanks v1.5.3
+Cryo Tanks v1.5.4
 =================
 
 A mod pack for Kerbal Space Program, specifically supporting my other mods Kerbal Atomics (https://github.com/ChrisAdderley/KerbalAtomics) and Cryogenic Engines (https://github.com/ChrisAdderley/CryoEngines), dealing with cryogenic fuels, their storage and their properties.
@@ -23,7 +23,7 @@ Required:
 - B9PartSwitch (2.17.0)
 - Community Resource Pack (1.4.1)
 - ModuleManager (4.1.4)
-- DynamicBatteryStorage (2.1.10)
+- DynamicBatteryStorage (2.2.0)
 
 Optional
 - Community Tech Tree (v2.2+)