mirror of
https://github.com/PorktoberRevolution/ReStocked
synced 2024-09-01 17:34:42 +00:00
Compare commits
154 Commits
90bd2b220f
...
166d2858db
Author | SHA1 | Date | |
---|---|---|---|
|
166d2858db | ||
|
804a1a9fa6 | ||
|
0cb4adf146 | ||
|
0cdfe6eaea | ||
|
45224d2f1f | ||
|
3ff95fa5d8 | ||
|
d0aabec3d4 | ||
|
dd2bbade5b | ||
|
361317cee8 | ||
|
6985802d06 | ||
|
9416fe1e94 | ||
|
6d573ff53e | ||
|
b2736e07be | ||
|
6d3e1d0214 | ||
|
1877cec291 | ||
|
c6cf16233e | ||
|
cbefb48363 | ||
|
9398e070f3 | ||
|
77106d0a22 | ||
|
ccc6fe705d | ||
|
7eca4f80a7 | ||
|
cef5cc9fd3 | ||
|
b12e0c3027 | ||
881ad98374 | |||
|
016454d64c | ||
|
26bd8939b0 | ||
|
0beafe34ae | ||
|
4c06604169 | ||
|
3a04bbc586 | ||
|
154a0a25c5 | ||
|
9f980d42f7 | ||
|
72996db963 | ||
|
b0450f0b56 | ||
|
009fceb03f | ||
|
66f3d8c9fb | ||
7e2da705a2 | |||
b4b1f83843 | |||
142d7b9f36 | |||
569c3be680 | |||
|
9154eeb515 | ||
|
07d5a72788 | ||
|
e1ef57f77d | ||
|
f00d5b4a71 | ||
|
4f8eaf639e | ||
901618b571 | |||
eb3f3227d9 | |||
|
858b34400a | ||
|
4c15ae60af | ||
|
857767e76a | ||
|
305416c102 | ||
|
22bf0e7055 | ||
|
6ab8377c3a | ||
|
285d3543f9 | ||
|
9081283174 | ||
|
59fd6bcb68 | ||
|
740a6e3e41 | ||
|
e9cc0c4515 | ||
|
def32dae09 | ||
|
d0aac2601e | ||
|
6472cce41a | ||
|
c0c899614f | ||
|
d3124f0606 | ||
|
4cb40be7ef | ||
|
999d7440cb | ||
|
99415890a3 | ||
|
8eac8f11cb | ||
|
628d600adc | ||
|
a67468a004 | ||
|
bd5293c398 | ||
|
993892994b | ||
|
7b2e0a277b | ||
|
29f4ec73cd | ||
|
d216c71d1a | ||
|
aec1d07b35 | ||
|
e5dc761a3c | ||
|
5f1c731a48 | ||
|
ff044dedce | ||
|
64a50541e4 | ||
|
dcad323e15 | ||
|
de199d26ff | ||
|
3358160411 | ||
|
e5ecbbf470 | ||
|
a7beefd4f9 | ||
|
be632e1a51 | ||
|
d99ef807ff | ||
0835a41cca | |||
4bf6f6bbf9 | |||
|
c15aacd364 | ||
|
2cceb95dac | ||
|
cbe7a3845c | ||
|
c9c13ea232 | ||
|
76fc72e6a5 | ||
|
eaaf03fcdf | ||
|
1253bc3d3d | ||
|
6923c21329 | ||
|
a4a5438fce | ||
|
edfc367142 | ||
|
50e1ebc7ab | ||
|
72d26b2233 | ||
31ccee2cc7 | |||
df13a68250 | |||
|
e6389c80b3 | ||
|
6950a081c6 | ||
|
f0b9a32420 | ||
|
9d0bd91afe | ||
10f3147d9b | |||
af43cd8f70 | |||
7fcb091c5f | |||
a0f70bd778 | |||
|
97b3101ed2 | ||
|
79ed44752f | ||
|
8eaebb1fb6 | ||
5853781461 | |||
|
bbea67abc8 | ||
|
5fe625b775 | ||
|
135a775aab | ||
87b844bca7 | |||
1683a26aee | |||
72c778308a | |||
def5ce9328 | |||
|
b713d3c88e | ||
19762f5cf4 | |||
c8b46f394b | |||
52bc3a557a | |||
|
d6b0513351 | ||
|
5e7c72d54c | ||
|
7027c8e59e | ||
|
40ba3c7b94 | ||
fd85e27e5d | |||
73b15d7e1a | |||
|
010efe35ab | ||
|
a020ae92db | ||
3ad88a5ad5 | |||
5d2dbeac2a | |||
d1eed01cf4 | |||
|
c21dffbdd7 | ||
|
6db20ee793 | ||
|
43c13e7608 | ||
|
05c95e8ae8 | ||
|
e696ea7389 | ||
|
d1942672e0 | ||
|
967851b650 | ||
|
d3ba149ea9 | ||
|
745bcaa376 | ||
|
f8667a8e7a | ||
|
6161095581 | ||
|
f3a6970a36 | ||
|
b1cc1f4e1a | ||
|
d24f1e7768 | ||
|
1ebf86d3e5 | ||
|
778779c9d2 | ||
|
896d4fe3d0 | ||
|
20e48cccf1 | ||
|
e2eb2ac725 |
45
.github/workflows/build.yml
vendored
Normal file
45
.github/workflows/build.yml
vendored
Normal file
@ -0,0 +1,45 @@
|
||||
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"
|
49
.github/workflows/deploy.yml
vendored
Normal file
49
.github/workflows/deploy.yml
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
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
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@ Distribution/Restock/GameData/ReStock/Spaces/**/*.png
|
||||
Distribution/Restock/GameData/ReStock/Props/**/*.png
|
||||
Distribution/RestockPlus/GameData/ReStockPlus/Props/**/*.png
|
||||
Distribution/RestockPlus/GameData/ReStockPlus/Spaces/**/*.png
|
||||
Distribution/Restock/GameData/ReStock/RestockPatchDisabler.cfg
|
||||
|
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +0,0 @@
|
||||
[submodule "Assets/CineboxAndrew"]
|
||||
path = Assets/CineboxAndrew
|
||||
url = https://github.com/drewcassidy/ReStocked-Assets.git
|
51
.travis.yml
51
.travis.yml
@ -1,51 +0,0 @@
|
||||
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
|
@ -1 +0,0 @@
|
||||
Subproject commit d965014af9f889e3838e73c8d4e1f38a815ee3ef
|
@ -13,8 +13,9 @@ package:
|
||||
- RestockRigidLegs
|
||||
dependencies: # Configure dependencies
|
||||
ModuleManager:
|
||||
version: 4.1.4
|
||||
location: s3
|
||||
location: url
|
||||
url: https://ksp.sarbian.com/jenkins/job/ModuleManager/163/artifact/ModuleManager.4.2.3.dll
|
||||
zip: false
|
||||
deploy:
|
||||
SpaceDock:
|
||||
enabled: true # activate/deactivate this deployment script
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user