Skip to content

Commit cb3fb5e

Browse files
Merge pull request #121 from post-kerbin-mining-corporation/dev
Release 1.3.0
2 parents 4bf42c7 + 10afeaa commit cb3fb5e

File tree

73 files changed

+7596
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+7596
-100
lines changed

.github/workflows/build.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: build
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
pull_request:
7+
branches: [ master ]
8+
9+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
10+
jobs:
11+
# This workflow contains a single job called "build"
12+
build-package:
13+
env:
14+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
15+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
16+
OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
17+
# The type of runner that the job will run on
18+
runs-on: ubuntu-latest
19+
20+
# Steps represent a sequence of tasks that will be executed as part of the job
21+
steps:
22+
# Checkout this repo
23+
- uses: actions/checkout@v2
24+
# Checkout another repo
25+
- uses: actions/checkout@v2
26+
with:
27+
# Repository name with owner.
28+
repository: 'post-kerbin-mining-corporation/build-deploy'
29+
# branch
30+
ref: 'actions'
31+
path: 'build-deploy'
32+
- uses: actions/setup-python@v2
33+
with:
34+
python-version: '3.8'
35+
architecture: 'x64'
36+
- name: Installing dependencies
37+
run: |
38+
python -m pip install --upgrade pip
39+
pip install flake8 pytest awscli boto3 requests
40+
#- name: Running deploy tests
41+
# run: pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests
42+
- name: Building package
43+
run: python build-deploy/src/package.py --f ".mod_data.yml"

.github/workflows/deploy.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: deploy
2+
3+
# Controls when the action will run. Triggers the workflow on push or pull request
4+
# events but only for the master branch
5+
on:
6+
push:
7+
branches: [ master ]
8+
9+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
10+
jobs:
11+
# This workflow contains a single job called "build"
12+
deploy-package:
13+
env:
14+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
15+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
16+
OAUTH_TOKEN: ${{ secrets.OAUTH_TOKEN }}
17+
# The type of runner that the job will run on
18+
runs-on: ubuntu-latest
19+
20+
# Steps represent a sequence of tasks that will be executed as part of the job
21+
steps:
22+
# Checkout this repo
23+
- uses: actions/checkout@v2
24+
# Checkout another repo
25+
- uses: actions/checkout@v2
26+
with:
27+
# Repository name with owner.
28+
repository: 'post-kerbin-mining-corporation/build-deploy'
29+
# branch
30+
ref: 'actions'
31+
path: 'build-deploy'
32+
- uses: actions/setup-python@v2
33+
with:
34+
python-version: '3.8'
35+
architecture: 'x64'
36+
- name: Installing dependencies
37+
run: |
38+
python -m pip install --upgrade pip
39+
pip install flake8 pytest awscli boto3 requests
40+
#- name: Running deploy tests
41+
# run: pytest -s --testpath "GameData/" build-deploy/src/tests/ # run the deploy tests
42+
- name: Building package
43+
run: python build-deploy/src/package.py --f ".mod_data.yml"
44+
- name: Staging package
45+
run: python build-deploy/src/stage.py --f ".mod_data.yml" # Run the staging script
46+
- name: Deploying package
47+
run: python build-deploy/src/deploy.py --f ".mod_data.yml" # Deploy package to spacedock, curse, github

.ksp_deploy_config.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
OAUTH_TOKEN_SSM_KEY: pkmc-bot-github-oauth-token
2+
GITHUB_USER_SSM_KEY: pkmc-bot-github-user
3+
GITHUB_USER_EMAIL_SSM_KEY: pkmc-bot-github-user-email

.mod_data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies: # Configure dependencies
1414
version: 2.17.0
1515
location: s3
1616
CommunityResourcePack:
17-
version: 1.3.0
17+
version: 1.4.2
1818
location: s3
1919
deploy:
2020
SpaceDock:

.travis.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

CKAN/NearFuturePropulsion-XenonHETs.netkan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"license": "MIT",
1010
"resources": {
1111
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
12-
"repository": "https://github.com/ChrisAdderley/NearFuturePropulsion"
12+
"repository": "https://github.com/post-kerbin-mining-corporation/NearFuturePropulsion"
1313
},
1414
"install": [
1515
{

CKAN/NearFuturePropulsion.netkan

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"license": "restricted",
1010
"resources": {
1111
"homepage": "https://forum.kerbalspaceprogram.com/index.php?/topic/155465-16x-near-future-technologies-16x-fixes-jan-21/",
12-
"repository": "https://github.com/ChrisAdderley/NearFuturePropulsion"
12+
"repository": "https://github.com/post-kerbin-mining-corporation/NearFuturePropulsion"
1313
},
1414
"install": [
1515
{
@@ -24,6 +24,7 @@
2424
],
2525
"recommends": [
2626
{ "name" : "CommunityTechTree" },
27+
{ "name" : "Waterfall" },
2728
{ "name" : "NearFutureElectrical" }
2829
],
2930
"suggests": [

Extras/XenonHallThrusters/NFPropulsionXenonHETs.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
@PART[ionArgon-0625-2]:AFTER[NearFuturePropulsion]
9595
{
9696
-EFFECTS {}
97-
EFFECTS
97+
EFFECTS
9898
{
9999
engage
100100
{

0 commit comments

Comments
 (0)