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

Release 1.1.0
post-kerbin-mining-corporation · Dec 23, 2020 · cb6b46e · cb6b46e
2 parents 378fb67 + 88aab88
commit cb6b46e
Show file tree

Hide file tree

Showing 73 changed files with 446 additions and 68 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/NearFutureExploration.netkan b/CKAN/NearFutureExploration.netkan
@@ -1,15 +1,15 @@
 {
     "spec_version": "v1.26",
     "identifier": "NearFutureExploration",
-    "$kref":        "#/ckan/github/ChrisAdderley/NearFutureExploration",
+    "$kref":        "#/ckan/github/post-kerbin-mining-corporation/NearFutureExploration",
     "$vref": "#/ckan/ksp-avc",
     "name": "Near Future Exploration",
     "author": "Nertea",
     "abstract" : "Expands probe selection with new cores, new probe bus parts, mini satellite parts and a large quantity of antennas.",
     "license": "restricted",
     "resources": {
       "homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-18x-near-future-technologies-18-updates-november-6th/",
-      "repository": "https://github.com/ChrisAdderley/NearFutureExploration"
+      "repository": "https://github.com/post-kerbin-mining-corporation/NearFutureExploration"
     },
     "depends": [
         { "name" : "B9PartSwitch" },

diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-deploy-wv3-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-deploy-wv3-1.cfg
@@ -71,4 +71,15 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 16
+    stackableQuantity = 2
+  }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 60
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-feeder-direct-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-feeder-direct-1.cfg
@@ -59,4 +59,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 1
   }  
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 30
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-feeder-relay-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-feeder-relay-1.cfg
@@ -58,4 +58,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 1
   }  
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 35
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-1.cfg
@@ -71,4 +71,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.75
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 45
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-2.cfg
@@ -69,4 +69,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.75
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-3.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-array-3.cfg
@@ -57,4 +57,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.75
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-1.cfg
@@ -57,4 +57,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 5
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-2.cfg
@@ -58,4 +58,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 20
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-3.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-phased-single-3.cfg
@@ -58,4 +58,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 15
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-1.cfg
@@ -52,5 +52,9 @@ PART
     AddedRange = 9000000
     DishColliderName = COL_FeederTarget
   }
-
+MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-2.cfg
@@ -51,4 +51,9 @@ PART
     AddedRange = 75000000
     DishColliderName = COL_FeederTarget
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-3.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-reflector-side-3.cfg
@@ -53,4 +53,9 @@ PART
     AddedRange = 850000000
     DishColliderName = Col_FeederTarget
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tdrs-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tdrs-1.cfg
@@ -70,4 +70,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.50
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tdrs-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tdrs-2.cfg
@@ -69,4 +69,9 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.5
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = -1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tiny-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-relay-tiny-1.cfg
@@ -56,4 +56,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.5
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 50
+    stackableQuantity = 1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-1.cfg
@@ -71,4 +71,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.5
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 48
+    stackableQuantity = 1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-2.cfg
@@ -72,4 +72,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.5
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 18
+    stackableQuantity = 2
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-3.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-rover-3.cfg
@@ -72,4 +72,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.5
   } 
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 32
+    stackableQuantity = 1
+  }
 } 
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-static-mini-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-static-mini-1.cfg
@@ -57,4 +57,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 12
+    stackableQuantity = 2
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-top-dish-1.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-top-dish-1.cfg
@@ -56,4 +56,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 60
+    stackableQuantity = 1
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-top-dish-2.cfg b/GameData/NearFutureExploration/Parts/Antenna/nfex-antenna-top-dish-2.cfg
@@ -55,4 +55,10 @@ PART
     FeedTransformName = AntennaFeedVector
     FeedScale = 0.9
   }
+  MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 280
+    stackableQuantity = 1
+  }
 }
diff --git a/GameData/NearFutureExploration/Parts/Bus/nfex-bus-chfr-1.cfg b/GameData/NearFutureExploration/Parts/Bus/nfex-bus-chfr-1.cfg
@@ -136,5 +136,9 @@ PART
       secondaryColor = #cecece
     }
   }
-
+   MODULE
+  {
+    name = ModuleCargoPart
+    packedVolume = 2800
+  }
 }