Further tweaks to materials, mk3 cockpit prototype

.github/workflows/build.yml

@@ -1,45 +0,0 @@
-name: Package Checks
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the prod branch
-on:
-  pull_request:
-    branches: [ prod ]
-
-# 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 Restock package
-      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"
-    - name: Building Restock+ package
-      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"

.github/workflows/deploy.yml

@@ -1,49 +0,0 @@
-name: Package and Deploy
-
-# Controls when the action will run. Triggers the workflow on push or pull request
-# events but only for the prod branch
-on:
-  push:
-    branches: [ prod ]
-
-# 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: Building Restock
-      run: python build-deploy/src/package.py --f "Distribution/Restock/.mod_data.yml"  
-    - name: Building RestockPlus
-      run: python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  
-    - name: Staging package
-      run: python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script
-    - name: Deploying Restock
-      run: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy package to spacedock, curse, github
-    - name: Deploying RestockPlus
-      run: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml" # Deploy package to spacedock, curse, github

.gitignore

@@ -7,9 +7,3 @@ build-deploy/
 bin/
 obj/
 *.swp
-**/@thumbs
-
-Distribution/Restock/GameData/ReStock/Spaces/**/*.png
-Distribution/Restock/GameData/ReStock/Props/**/*.png
-Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
-Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Assets/CineboxAndrew"]
+	path = Assets/CineboxAndrew
+	url = https://github.com/drewcassidy/ReStocked-Assets.git

.travis.yml

@@ -0,0 +1,51 @@
+language: python
+python:
+  - 3.6
+install:
+  - pip install awscli boto3 requests
+branches:
+  only:
+    - prod
+script:
+  - git clone https://github.com/post-kerbin-mining-corporation/build-deploy.git  # clone this repo, it contains the stuff that does the heavy lifting
+  - cd build-deploy
+  - git checkout master
+  - cd ..
+  - pytest -s --testpath "Distribution/" build-deploy/src/tests/  # run the deploy tests
+  - python build-deploy/src/package.py  --f "Distribution/Restock/.mod_data.yml"  # Build RS package
+  - python build-deploy/src/package.py --f "Distribution/RestockPlus/.mod_data.yml"  # Build RS+ package
+before_deploy:
+  - python build-deploy/src/stage.py --f "Distribution/Restock/.mod_data.yml" # Run the staging script. Note that tags will come off restock base always
+deploy:
+  - provider: script
+    script: python build-deploy/src/deploy.py --f "Distribution/Restock/.mod_data.yml" # Deploy RS package to spacedock, curse, github
+    skip_cleanup: true
+    on:
+      branch: prod
+  - provider: script
+    script: python build-deploy/src/deploy.py --f "Distribution/RestockPlus/.mod_data.yml"  # Deploy RS+ package to spacedock, curse, github
+    skip_cleanup: true
+    on:
+      branch: prod
+  - provider: s3 # releases to S3
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    bucket: "nertea-ksp-modding-releases"
+    local_dir: deploy/ReStock
+    skip_cleanup: true
+    acl: public_read
+    region: us-east-2
+    upload-dir: restock
+    on:
+      branch: prod
+  - provider: s3 # releases to S3
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    bucket: "nertea-ksp-modding-releases"
+    local_dir: deploy/ReStockPlus
+    skip_cleanup: true
+    acl: public_read
+    region: us-east-2
+    upload-dir: restockplus
+    on:
+      branch: prod

Distribution/Restock/.mod_data.yml

@@ -13,7 +13,7 @@ package:
     - RestockRigidLegs
 dependencies:  # Configure dependencies
   ModuleManager:
-    version: 4.1.4
+    version: 4.1.3
     location: s3
 deploy:
   SpaceDock: