Skip to content

Commit 2b6b0e9

Browse files
dhalbertdhalbert
committed
temporary change to test uploads
1 parent 715ea13 commit 2b6b0e9

1 file changed

Lines changed: 18 additions & 17 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: |
3838
sudo apt-get install -y eatmydata
3939
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
40-
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black
40+
pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli
4141
- name: Versions
4242
run: |
4343
gcc --version
@@ -86,35 +86,35 @@ jobs:
8686
working-directory: tools
8787
- name: Build mpy-cross.static-raspbian
8888
run: make -C mpy-cross -j2 -f Makefile.static-raspbian
89-
- uses: actions/upload-artifact@v1.0.0
89+
- uses: actions/upload-artifact@v2
9090
with:
9191
name: mpy-cross.static-raspbian
9292
path: mpy-cross/mpy-cross.static-raspbian
9393

9494
- name: Build mpy-cross.static
9595
run: make -C mpy-cross -j2 -f Makefile.static
96-
- uses: actions/upload-artifact@v1.0.0
96+
- uses: actions/upload-artifact@v2
9797
with:
9898
name: mpy-cross.static-amd64-linux
9999
path: mpy-cross/mpy-cross.static
100100

101101
- name: Build mpy-cross.static-mingw
102102
run: make -C mpy-cross -j2 -f Makefile.static-mingw
103-
- uses: actions/upload-artifact@v1.0.0
103+
- uses: actions/upload-artifact@v2
104104
with:
105105
name: mpy-cross.static-x64-windows
106106
path: mpy-cross/mpy-cross.static.exe
107107

108108
- name: Upload mpy-cross builds to S3
109109
run: |
110-
"[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1"
111-
"[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1"
112-
"[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp mpy-cross/mpy-cross.static-mingw s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-mingw-${{ env.CP_VERSION }} --no-progress --region us-east-1"
113-
"[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1"
110+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-raspbian s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-raspbian-${{ env.CP_VERSION }} --no-progress --region us-east-1
111+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-amd64-linux-${{ env.CP_VERSION }} --no-progress --region us-east-1
112+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static-mingw s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-mingw-${{ env.CP_VERSION }} --no-progress --region us-east-1
113+
[ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/mpy-cross.static.exe s3://adafruit-circuit-python/bin/mpy-cross/mpy-cross.static-x64-windows-${{ env.CP_VERSION }}.exe --no-progress --region us-east-1
114114
env:
115115
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
116116
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
117-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
117+
if: true || github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
118118

119119

120120
mpy-cross-mac:
@@ -124,9 +124,9 @@ jobs:
124124
env:
125125
GITHUB_CONTEXT: ${{ toJson(github) }}
126126
run: echo "$GITHUB_CONTEXT"
127-
- name: Make gettext programs available
127+
- name: Install dependencies
128128
run: |
129-
brew install gettext
129+
brew install gettext awscli
130130
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
131131
- name: Versions
132132
run: |
@@ -144,16 +144,17 @@ jobs:
144144
echo "::set-env name=CP_VERSION::$(git describe --dirty --tags)"
145145
- name: Build mpy-cross
146146
run: make -C mpy-cross -j2
147-
- uses: actions/upload-artifact@v1.0.0
147+
- uses: actions/upload-artifact@v2
148148
with:
149149
name: mpy-cross-macos-catalina
150150
path: mpy-cross/mpy-cross
151151
- name: Upload mpy-cross build to S3
152-
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"
152+
run: |
153+
[ -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
153154
env:
154155
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
155156
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
156-
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
157+
if: true || github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
157158

158159

159160
build-arm:
@@ -337,7 +338,7 @@ jobs:
337338
working-directory: tools
338339
env:
339340
BOARDS: ${{ matrix.board }}
340-
- uses: actions/upload-artifact@v1.0.0
341+
- uses: actions/upload-artifact@v2
341342
with:
342343
name: ${{ matrix.board }}
343344
path: bin/${{ matrix.board }}
@@ -385,7 +386,7 @@ jobs:
385386
working-directory: tools
386387
env:
387388
BOARDS: ${{ matrix.board }}
388-
- uses: actions/upload-artifact@v1.0.0
389+
- uses: actions/upload-artifact@v2
389390
with:
390391
name: ${{ matrix.board }}
391392
path: bin/${{ matrix.board }}
@@ -465,7 +466,7 @@ jobs:
465466
IDF_PATH: ${{ github.workspace }}/ports/esp32s2/esp-idf
466467
IDF_TOOLS_PATH: ${{ github.workspace }}/.idf_tools
467468
BOARDS: ${{ matrix.board }}
468-
- uses: actions/upload-artifact@v1.0.0
469+
- uses: actions/upload-artifact@v2
469470
with:
470471
name: ${{ matrix.board }}
471472
path: bin/${{ matrix.board }}

0 commit comments

Comments
 (0)