Skip to content

Commit 70a4efc

Browse files
microdev1microdev1
committed
use composite action for aws s3 upload
1 parent 17e03c4 commit 70a4efc

4 files changed

Lines changed: 30 additions & 40 deletions

File tree

‎.github/actions/upload_aws/action.yml‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
name: Upload to AWS S3
22

3-
43
inputs:
54
source:
65
required: true
76
type: string
87

98
destination:
10-
required: true
9+
required: false
1110
type: string
1211

12+
AWS_ACCESS_KEY_ID:
13+
required: true
14+
15+
AWS_SECRET_ACCESS_KEY:
16+
required: true
1317

1418
runs:
1519
using: composite
@@ -18,10 +22,11 @@ runs:
1822
if: >-
1923
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
2024
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
21-
run: |
22-
pip install awscli
23-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
25+
run: >-
26+
[ -z "$AWS_ACCESS_KEY_ID" ] ||
27+
aws s3 cp ${{ inputs.source }} s3://adafruit-circuit-python/bin/${{ inputs.destination }} --recursive --no-progress --region us-east-1
2428
env:
2529
AWS_PAGER: ''
26-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
27-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
30+
AWS_ACCESS_KEY_ID: ${{ inputs.AWS_ACCESS_KEY_ID }}
31+
AWS_SECRET_ACCESS_KEY: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
32+
shell: bash

‎.github/workflows/build-boards.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,8 @@ jobs:
7676
name: ${{ matrix.board }}
7777
path: bin/${{ matrix.board }}
7878
- name: Upload to S3
79-
if: >-
80-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
81-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
82-
run: |
83-
pip install awscli
84-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1
85-
env:
86-
AWS_PAGER: ''
79+
uses: ./.github/actions/upload_aws
80+
with:
81+
source: bin/
8782
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
8883
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/build-mpy-cross.yml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,9 @@ jobs:
6161
path: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
6262

6363
- name: Upload to S3
64-
if: >-
65-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
66-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
67-
env:
68-
AWS_PAGER: ''
64+
uses: ./.github/actions/upload_aws
65+
with:
66+
source: mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
67+
destination: mpy-cross/${{ env[format('OS_{0}', matrix.mpy-cross)] }}/mpy-cross-${{ env.CP_VERSION }}.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
6968
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
7069
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
71-
run: >-
72-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp
73-
mpy-cross/mpy-cross.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
74-
s3://adafruit-circuit-python/bin/mpy-cross/$OS_${{ matrix.mpy-cross }}/mpy-cross-$CP_VERSION.${{ env[format('EX_{0}', matrix.mpy-cross)] || matrix.mpy-cross }}
75-
--no-progress --region us-east-1

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,23 +144,23 @@ jobs:
144144
path: mpy-cross/mpy-cross-arm64
145145
- name: Make universal binary
146146
run: lipo -create -output mpy-cross-macos-universal mpy-cross/mpy-cross mpy-cross/mpy-cross-arm64
147-
- uses: actions/upload-artifact@v3
147+
- name: Upload artifact
148+
uses: actions/upload-artifact@v3
148149
with:
149150
name: mpy-cross-macos-11-universal
150151
path: mpy-cross-macos-universal
151-
- name: Upload mpy-cross build to S3
152+
- name: Upload to S3
152153
if: >-
153154
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
154155
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
155-
env:
156-
AWS_PAGER: ''
157-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
158-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
159156
run: |
160157
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-universal --no-progress --region us-east-1
161158
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-arm64 --no-progress --region us-east-1
162159
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross-macos-11-${{ env.CP_VERSION }}-x64 --no-progress --region us-east-1
163-
160+
env:
161+
AWS_PAGER: ''
162+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
163+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
164164

165165
build-doc:
166166
runs-on: ubuntu-22.04
@@ -206,16 +206,12 @@ jobs:
206206
name: docs
207207
path: _build/latex
208208
- name: Upload to S3
209-
if: >-
210-
(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
211-
(github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
212-
env:
213-
AWS_PAGER: ''
209+
uses: ./.github/actions/upload_aws
210+
with:
211+
source: circuitpython-stubs/dist/*.tar.gz
212+
destination: stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip
214213
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
215214
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
216-
run: |
217-
zip -9r circuitpython-stubs.zip circuitpython-stubs
218-
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp circuitpython-stubs/dist/*.tar.gz s3://adafruit-circuit-python/bin/stubs/circuitpython-stubs-${{ env.CP_VERSION }}.zip --no-progress --region us-east-1
219215
- name: Upload stubs to PyPi
220216
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
221217
env:

0 commit comments

Comments
 (0)