diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..2872876 --- /dev/null +++ b/.github/workflows/build.yml @@ -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" \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..e302790 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -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 \ No newline at end of file diff --git a/.ksp_deploy_config.yml b/.ksp_deploy_config.yml new file mode 100644 index 0000000..91e5200 --- /dev/null +++ b/.ksp_deploy_config.yml @@ -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 \ No newline at end of file diff --git a/.mod_data.yml b/.mod_data.yml index ef5eabc..31f089c 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -11,7 +11,7 @@ dependencies: # Configure dependencies version: 4.1.4 location: s3 Waterfall: - tag: 0.2.1 + tag: 0.2.5 location: github repository: ChrisAdderley/Waterfall deploy: diff --git a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version index 88f320a..403c24c 100644 --- a/GameData/WaterfallRestock/Versioning/WaterfallRestock.version +++ b/GameData/WaterfallRestock/Versioning/WaterfallRestock.version @@ -1,12 +1,12 @@ { "NAME":"WaterfallRestock", - "URL":"https://raw.githubusercontent.com/ChrisAdderley/WaterfallRestock/master/GameData/WaterfallRestock/Versioning/WaterfallRestock.version", - "DOWNLOAD":"https://github.com/ChrisAdderley/WaterfallRestock", + "URL":"https://raw.githubusercontent.com/post-kerbin-mining-corporation/WaterfallRestock/master/GameData/WaterfallRestock/Versioning/WaterfallRestock.version", + "DOWNLOAD":"https://github.com/post-kerbin-mining-corporation/WaterfallRestock", "VERSION": { "MAJOR":0, "MINOR":1, - "PATCH":1, + "PATCH":2, "BUILD":0 }, "KSP_VERSION": diff --git a/changelog.txt b/changelog.txt index 7b86f1b..0140c9b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +v0.1.2 +------ +- Fixed duplicated Kodiak config + v0.1.1 ------ - Fixed some MM errors for some plumes diff --git a/readme.txt b/readme.txt index f0bc1bf..0e7c4f9 100644 --- a/readme.txt +++ b/readme.txt @@ -1,5 +1,5 @@ ================================= -Waterfall - Restock Configs 0.1.1 +Waterfall - Restock Configs 0.1.2 ================================= This is a configuration pack for the Waterfall mod, which applies Waterfall type effects to Restock and Restock+ models. It does nothing on its own and requires the base Waterfall mod to function. @@ -9,7 +9,7 @@ DEPENDENCIES ============ Required: -- Waterfall (0.2.1) +- Waterfall (0.2.5) - Restock (1.2+) - ModuleManager (v4.1.4)