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

Prepare 1.3.0
post-kerbin-mining-corporation · Dec 23, 2020 · 444f6e8 · 444f6e8
2 parents 2a9d133 + d4981d8
commit 444f6e8
Show file tree

Hide file tree

Showing 38 changed files with 257 additions and 44 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/.travis.yml b/.travis.yml
diff --git a/CKAN/NearFutureSolar.netkan b/CKAN/NearFutureSolar.netkan
@@ -9,7 +9,7 @@
   "$vref"               : "#/ckan/ksp-avc",
   "resources": {
     "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
-    "repository": "https://github.com/ChrisAdderley/NearFutureSolar"
+    "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureSolar"
   },
   "depends": [
       { "name" : "NearFutureSolar-Core" },

diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-ikonos-1.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-ikonos-1.cfg
@@ -185,4 +185,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 80
+  }
 }
diff --git a/...lar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-messenger-1.cfg b/...lar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x1-messenger-1.cfg
@@ -185,5 +185,9 @@ PART
 			}
 		}
 	}
-
+	MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 650
+  }
 }
diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-mro-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-mro-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 100
+  }
 }
diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-wv4-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x2-wv4-1.cfg
@@ -185,4 +185,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 180
+  }
 }
diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 170
+  }
 }
diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-2.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x3-orion-2.cfg
@@ -185,4 +185,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 200
+  }
 }
diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-1.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 200
+  }
 }
diff --git a/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-2.cfg b/...eSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x4-dragon-2.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 250
+  }
 }
diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-dawn-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-dawn-1.cfg
@@ -184,4 +184,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-goes-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-1x5-goes-1.cfg
@@ -190,4 +190,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x20-hub-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x20-hub-1.cfg
@@ -299,4 +299,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x6x6-lab-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-2x6x6-lab-1.cfg
@@ -245,4 +245,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...olar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-hayabusa-1.cfg b/...olar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-hayabusa-1.cfg
@@ -185,4 +185,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 410
+  }
 }
diff --git a/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-tdrss-1.cfg b/...reSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-tdrss-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 100
+  }
 }
diff --git a/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-wv3-1.cfg b/...tureSolar/Parts/SolarPanels/deploying-advanced/nfs-panel-deploying-advanced-3x1-wv3-1.cfg
@@ -184,4 +184,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 140
+  }
 }
diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-bfs-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-bfs-1.cfg
@@ -150,4 +150,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 600
+  }
 }
diff --git a/...ureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-copernicus-1.cfg b/...ureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-copernicus-1.cfg
@@ -155,4 +155,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dsg-1.cfg b/...NearFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-dsg-1.cfg
@@ -150,4 +150,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-nautilus-1.cfg b/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-nautilus-1.cfg
@@ -168,4 +168,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...arFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-orion-1.cfg b/...arFutureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-orion-1.cfg
@@ -148,4 +148,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 60
+  }
 }
diff --git a/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-starship-1.cfg b/...utureSolar/Parts/SolarPanels/deploying-blanket/nfs-panel-deploying-blanket-starship-1.cfg
@@ -195,4 +195,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 200
+  }
 }
diff --git a/...rts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x3x1-juice-1.cfg b/...rts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x3x1-juice-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume =220
+  }
 }
diff --git a/.../Parts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x4-juno-1.cfg b/.../Parts/SolarPanels/deploying-concentrator/nfs-panel-deploying-concentrator-1x4-juno-1.cfg
@@ -186,4 +186,9 @@ PART
 			}
 		}
 	}
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = 210
+  }
 }
diff --git a/...ta/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-25-1.cfg b/...ta/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-25-1.cfg
@@ -254,4 +254,9 @@ PART
       }
     }
   }
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
diff --git a/...a/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-375-1.cfg b/...a/NearFutureSolar/Parts/SolarPanels/deploying-curved/nfs-panel-deploying-curved-375-1.cfg
@@ -176,4 +176,10 @@ PART
       }
     }
   }
+
+  MODULE
+  {
+    name = ModuleCargoPart    
+    packedVolume = -1
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -185,4 +185,9 @@ PART @@
     			}
     		}
     	}
+      MODULE
+      {
+        name = ModuleCargoPart
+        packedVolume = 80
+      }
     }