summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authormicroDev <70126934+microDev1@users.noreply.github.com>2020-11-24 12:24:48 +0530
committermicroDev <70126934+microDev1@users.noreply.github.com>2020-11-24 12:24:48 +0530
commitbbe13490b55bceed477b28c7ed4256db69cca84b (patch)
treeb7f28f67626dcd76196500294e13ac3b703f89a0 /.github
parent6ff24410ebe9e75456b9d5d64f37fbe019caf42c (diff)
parentebdc48ae22589080300da249f416bd55f1c121bd (diff)
Merge branch 'main' into nvm-s2
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml14
-rw-r--r--.github/workflows/create_website_pr.yml2
-rw-r--r--.github/workflows/pre-commit.yml2
3 files changed, 12 insertions, 6 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c83f37e6e..8e72a4021 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ on:
jobs:
test:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
steps:
- name: Dump GitHub context
env:
@@ -119,6 +119,7 @@ jobs:
zip -9r circuitpython-stubs.zip circuitpython-stubs
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs.zip s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
env:
+ AWS_PAGER: ''
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
@@ -159,13 +160,14 @@ jobs:
run: |
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-catalina-${{ env.CP_VERSION }} --no-progress --region us-east-1
env:
+ AWS_PAGER: ''
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
build-arm:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
needs: test
strategy:
fail-fast: false
@@ -196,6 +198,7 @@ jobs:
- "circuitplayground_express_displayio"
- "clue_nrf52840_express"
- "cp32-m4"
+ - "cp_sapling_m0"
- "datalore_ip_m4"
- "datum_distance"
- "datum_imu"
@@ -363,12 +366,13 @@ jobs:
- name: Upload to S3
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
env:
+ AWS_PAGER: ''
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
build-riscv:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
needs: test
strategy:
fail-fast: false
@@ -411,11 +415,12 @@ jobs:
- name: Upload to S3
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
env:
+ AWS_PAGER: ''
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
build-xtensa:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
needs: test
strategy:
fail-fast: false
@@ -505,6 +510,7 @@ jobs:
- name: Upload to S3
run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
env:
+ AWS_PAGER: ''
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
diff --git a/.github/workflows/create_website_pr.yml b/.github/workflows/create_website_pr.yml
index 71959ffdc..c8aca30e4 100644
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@@ -10,7 +10,7 @@ on:
jobs:
website:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- name: Dump GitHub context
env:
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index eac9bfe09..8caf56d26 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -11,7 +11,7 @@ on:
jobs:
pre-commit:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- uses: actions/setup-python@v1