Skip to content

Commit

Permalink
Merge pull request #117 from post-kerbin-mining-corporation/dev
Browse files Browse the repository at this point in the history
Prepare 1.3.0
  • Loading branch information
ChrisAdderley authored Dec 23, 2020
2 parents f861b57 + b741867 commit e4096a0
Show file tree
Hide file tree
Showing 24 changed files with 189 additions and 47 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/NearFutureConstruction.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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/NearFutureConstruction"
"repository": "https://github.com/post-kerbin-mining-corporation/NearFutureConstruction"
},
"depends" : [
{ "name" : "B9PartSwitch" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,9 @@ PART
snapOffset = 180
stagingEnabled = False
}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,9 @@ PART
snapOffset = 180
stagingEnabled = False
}
MODULE
{
name = ModuleCargoPart
packedVolume = 250
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,9 @@ PART
}

}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,10 @@ PART


}

MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,9 @@ PART
thermalMassModifier = 0.4 // I am hollow

tags = #LOC_NFConstruction_truss-hex-adapter-01_tags

MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,9 @@ PART


}
MODULE
{
name = ModuleCargoPart
packedVolume = 56
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,9 @@ PART


}
MODULE
{
name = ModuleCargoPart
packedVolume = 28
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,9 @@ PART


}
MODULE
{
name = ModuleCargoPart
packedVolume = 36
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,9 @@ PART
descriptionDetail = #LOC_NFConstruction_switcher_truss_dual_detail
}
}

MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,9 @@ PART
}

}

MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,9 @@ PART

tags = #LOC_NFConstruction_truss-octo-adapter-1_tags


MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,9 @@ PART
descriptionDetail = #LOC_NFConstruction_switcher_angle_30_detail
}
}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PART
node_stack_top02 = 0.0, 0.899, 0.4018, 0.0, 0.5, 0.5, 2
node_stack_top03 = 0.0, 0.665, 0.197, 0.0, 0.86602540378, 0.5, 2
node_stack_bottom = 0.0, -0.07155213, 0.0, 0.0, -1.0, 0.0, 2
ode_attach = 0.0, -0.07155213, 0.0, 0.0, -1.0, 0.0, 2
node_attach = 0.0, -0.07155213, 0.0, 0.0, -1.0, 0.0, 2

bulkheadProfiles = octotruss, srf

Expand Down Expand Up @@ -121,4 +121,9 @@ PART
descriptionDetail = #LOC_NFConstruction_switcher_angle_30_detail
}
}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,9 @@ PART
}

}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,9 @@ PART
nodeType = size2
stagingEnabled = False
}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,9 @@ PART
canBeTransferredToInVessel = True
canTransferInVessel = True
}
MODULE
{
name = ModuleCargoPart
packedVolume = -1
}
}
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"NAME":"NearFutureConstruction",
"URL":"https://raw.githubusercontent.com/ChrisAdderley/NearFutureConstruction/master/GameData/NearFutureConstruction/Versioning/NearFutureConstruction.version",
"URL":"https://raw.githubusercontent.com/post-kerbin-mining-corporation/NearFutureConstruction/master/GameData/NearFutureConstruction/Versioning/NearFutureConstruction.version",
"DOWNLOAD":"http://forum.kerbalspaceprogram.com/index.php?/topic/155465-near-future-technologies",
"VERSION":
{
"MAJOR":1,
"MINOR":2,
"PATCH":3,
"MINOR":3,
"PATCH":0,
"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
}
}
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v1.3.0
------
- KSP 1.11.x
- Fix crewed truss angled adapter attach node.
- Set many parts as useable in inventories/construction mode

v1.2.3
------
- KSP 1.10.x
Expand Down
2 changes: 1 addition & 1 deletion readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
====================================
NEAR FUTURE CONSTRUCTION PACK v1.2.3
NEAR FUTURE CONSTRUCTION PACK v1.3.0
====================================

This pack contains structural components suitable for building impressive looking deep space vessels and stations. This means large trusses, structural adapters, multi-adapters and radial adapters. It is part of the Near Future Technologies set of packs, so works great with any or all of them.
Expand Down

0 comments on commit e4096a0

Please sign in to comment.