andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2021-03-07 05:18:28 +00:00
parent fbd6b28633 08e512a273
commit d170a1c0e2
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/api.yml vendored
View File

@ -25,18 +25,13 @@ jobs:
- name: Generate API Data - name: Generate API Data
run: qmk generate-api run: qmk generate-api
- name: Install rsync
run: |
apt-get update && apt-get install -y rsync
- name: Upload API Data - name: Upload API Data
uses: JamesIves/github-pages-deploy-action@3.7.1 uses: jakejarvis/s3-sync-action@master
with: with:
ACCESS_TOKEN: ${{ secrets.API_TOKEN_GITHUB }} args: --acl public-read --follow-symlinks --delete
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} env:
BRANCH: main AWS_S3_BUCKET: ${{ secrets.API_SPACE_MASTER }}
FOLDER: api_data/v1 AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
CLEAN: true AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
GIT_CONFIG_EMAIL: hello@qmk.fm AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
REPOSITORY_NAME: qmk/qmk_keyboards SOURCE_DIR: 'api-data'
TARGET_FOLDER: v1

21
.github/workflows/develop_api.yml vendored
View File

@ -25,18 +25,13 @@ jobs:
- name: Generate API Data - name: Generate API Data
run: qmk generate-api run: qmk generate-api
- name: Install rsync
run: |
apt-get update && apt-get install -y rsync
- name: Upload API Data - name: Upload API Data
uses: JamesIves/github-pages-deploy-action@3.7.1 uses: jakejarvis/s3-sync-action@master
with: with:
ACCESS_TOKEN: ${{ secrets.API_TOKEN_GITHUB }} args: --acl public-read --follow-symlinks --delete
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} env:
BRANCH: main AWS_S3_BUCKET: ${{ secrets.API_SPACE_DEVELOP }}
FOLDER: api_data/v1 AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY }}
CLEAN: true AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_KEY }}
GIT_CONFIG_EMAIL: hello@qmk.fm AWS_S3_ENDPOINT: https://nyc3.digitaloceanspaces.com
REPOSITORY_NAME: qmk/qmk_keyboards_devel SOURCE_DIR: 'api-data'
TARGET_FOLDER: v1