summaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/api.yml12
-rw-r--r--.github/workflows/develop_api.yml43
2 files changed, 9 insertions, 46 deletions
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index dd3fbdaa92..0cff4f6e75 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -4,6 +4,7 @@ on:
push:
branches:
- master
+ - develop
paths:
- 'keyboards/**'
- 'layouts/community/**'
@@ -17,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
container: qmkfm/qmk_cli
- # protect against those who develop with their fork on master
+ # protect against those who work in their fork on 'important' branches
if: github.repository == 'qmk/qmk_firmware'
steps:
@@ -26,15 +27,20 @@ jobs:
fetch-depth: 1
persist-credentials: false
+ - name: Install dependencies
+ run: |
+ pip3 install -r requirements-dev.txt
+
- name: Generate API Data
- run: qmk generate-api
+ run: |
+ qmk generate-api
- name: Upload API Data
uses: jakejarvis/s3-sync-action@master
with:
args: --acl public-read --follow-symlinks --delete
env:
- AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
+ AWS_S3_BUCKET: ${{ github.ref == 'refs/heads/develop' && secrets['API_SPACE_DEVELOP'] || secrets['API_SPACE_MASTER'] }}
AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
diff --git a/.github/workflows/develop_api.yml b/.github/workflows/develop_api.yml
deleted file mode 100644
index 194305e730..0000000000
--- a/.github/workflows/develop_api.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: Update Develop API Data
-
-on:
- push:
- branches:
- - develop
- paths:
- - 'keyboards/**'
- - 'layouts/community/**'
- - 'lib/python/**'
- - 'data/**'
- - '.github/workflows/develop_api.yml'
- workflow_dispatch:
-
-jobs:
- api_data:
- runs-on: ubuntu-latest
- container: qmkfm/qmk_cli
-
- # protect against those who work in their fork on develop
- if: github.repository == 'qmk/qmk_firmware'
-
- steps:
- - uses: actions/checkout@v3
- with:
- fetch-depth: 1
- persist-credentials: false
-
- - name: Generate API Data
- run: |
- python3 -m pip install -r requirements-dev.txt
- qmk generate-api
-
- - name: Upload API Data
- uses: jakejarvis/s3-sync-action@master
- with:
- args: --acl public-read --follow-symlinks --delete
- env:
- AWS_S3_BUCKET: ${{ secrets.API_SPACE_DEVELOP }}
- AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
- AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
- AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
- SOURCE_DIR: '.build/api_data'