Skip to content

Commit

Permalink
Merge pull request #38 from post-kerbin-mining-corporation/dev
Browse files Browse the repository at this point in the history
1.11 updates
  • Loading branch information
ChrisAdderley authored Dec 23, 2020
2 parents f569410 + 2ec6eab commit d81aa08
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 41 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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"
47 changes: 47 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions .ksp_deploy_config.yml
Original file line number Diff line number Diff line change
@@ -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
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion CKAN/HeatControl.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"abstract" : "New categories of heat radiator for your spacecraft",
"resources": {
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/112027-16x-heat-control-more-radiators-january-21/&page=1",
"repository": "https://github.com/ChrisAdderley/HeatControl"
"repository": "https://github.com/post-kerbin-mining-corporation/HeatControl"
},
"depends" : [
{ "name" : "ModuleManager" }
Expand Down
10 changes: 5 additions & 5 deletions GameData/HeatControl/Versioning/HeatControl.version
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"NAME":"HeatControl",
"URL":"https://github.com/ChrisAdderley/HeatControl/tree/master/GameData/HeatControl/Versioning/HeatControl.version",
"URL":"https://github.com/post-kerbin-mining-corporation/HeatControl/tree/master/GameData/HeatControl/Versioning/HeatControl.version",
"DOWNLOAD":"http://forum.kerbalspaceprogram.com/index.php?/topic/112027-102-heat-control-manage-your-ships-heat-not-functional-in-104/",
"VERSION":
{
"MAJOR":0,
"MINOR":5,
"PATCH":2,
"PATCH":3,
"BUILD":0
},
"KSP_VERSION":
{
"MAJOR":1,
"MINOR":10,
"PATCH":1
"MINOR":11,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
Expand All @@ -22,7 +22,7 @@
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":10,
"MINOR":11,
"PATCH":99
}
}
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
v0.5.3
-------
- KSP 1.11

v0.5.2
-------
- KSP 1.10
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
====================
HEAT CONTROL v0.5.2
HEAT CONTROL v0.5.3
====================

This is a pack containing parts useful for controlling the heat on your spacecraft.
Expand Down

0 comments on commit d81aa08

Please sign in to comment.