Skip to content

Commit c9347ae

Browse files
alirana01alirana01
authored
ci_release.yml links fix
1 parent 150de4d commit c9347ae

File tree

1 file changed

+34
-31
lines changed

1 file changed

+34
-31
lines changed

‎.github/workflows/ci_release.yml‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v3
1919

20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@v3
2222
with:
23-
java-version: '17'
23+
java-version: '21'
2424
distribution: 'temurin'
2525

2626
- name: Get version from tag
@@ -217,9 +217,9 @@ jobs:
217217
runs-on: macos-latest
218218
needs: windows-sign
219219
env:
220-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
221-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
222-
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
220+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
221+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
222+
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
223223
steps:
224224
- uses: actions/checkout@v3
225225

@@ -235,13 +235,13 @@ jobs:
235235
name: espressif-ide-linux
236236
path: artifacts/linux
237237

238-
- name: Download macOS x86_64 dmg zip
238+
- name: Download macOS x86_64 dmg
239239
uses: actions/download-artifact@v4
240240
with:
241241
name: espressif-ide-macosx-cocoa-x86_64
242242
path: artifacts/macos_x86
243243

244-
- name: Download macOS aarch64 dmg zip
244+
- name: Download macOS aarch64 dmg
245245
uses: actions/download-artifact@v4
246246
with:
247247
name: espressif-ide-macosx.cocoa.aarch64
@@ -256,45 +256,48 @@ jobs:
256256
- name: Extract version from tag and prepare folder
257257
id: get_version
258258
run: |
259-
if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
260-
TAG="${GITHUB_REF##*/}"
261-
VERSION="${TAG#v}"
262-
else
263-
VERSION="testing"
259+
if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
260+
TAG="${GITHUB_REF##*/}"
261+
VERSION="${TAG#v}"
262+
else
263+
VERSION="testing"
264264
fi
265-
echo "version=$VERSION" >> "$GITHUB_ENV"
266-
echo "FOLDER=v${VERSION}" >> $GITHUB_ENV
265+
echo "VERSION=$VERSION" >> $GITHUB_ENV
266+
echo "FOLDER=v$VERSION" >> $GITHUB_ENV
267267
268268
- name: Rename DMGs with version suffix
269269
run: |
270-
mv artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64.dmg artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64-v${{ env.VERSION }}.dmg
271-
mv artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64.dmg artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64-v${{ env.VERSION }}.dmg
270+
VERSION="${{ env.VERSION }}"
271+
mv artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64.dmg "artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64-v$VERSION.dmg"
272+
mv artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64.dmg "artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64-v$VERSION.dmg"
272273
273-
- name: Compress the archives for upload
274+
- name: Compress the update and win32 artifacts
274275
run: |
275-
zip -r com.espressif.idf.update-v${{ env.VERSION }}.zip artifacts/update/*
276-
zip -r Espressif-IDE-${{ env.VERSION }}-win32.win32.x86_64.zip artifacts/win32/*
276+
VERSION="${{ env.VERSION }}"
277+
zip -r "com.espressif.idf.update-v$VERSION.zip" artifacts/update/*
278+
zip -r "Espressif-IDE-$VERSION-win32.win32.x86_64.zip" artifacts/win32/*
277279
278280
- name: Upload build assets to dl.espressif.com
279281
run: |
280-
aws s3 rm s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest --recursive
282+
VERSION="${{ env.VERSION }}"
281283
282-
aws s3 cp --acl=public-read --recursive artifacts/linux/ s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
283-
aws s3 cp --acl=public-read ./releng/index.html s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest/
284+
aws s3 rm "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest" --recursive
284285
285-
aws s3 cp --acl=public-read --recursive artifacts/linux/ s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/v${{ env.VERSION }}
286+
aws s3 cp --acl=public-read --recursive artifacts/linux/ "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/"
287+
aws s3 cp --acl=public-read ./releng/index.html "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/latest/"
288+
aws s3 cp --acl=public-read --recursive artifacts/linux/ "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/v$VERSION"
286289
287-
aws s3 cp --acl=public-read com.espressif.idf.update-v${{ env.VERSION }}.zip s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/
288-
aws s3 cp --acl=public-read artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64-v${{ env.VERSION }}.dmg s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
289-
aws s3 cp --acl=public-read artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64-v${{ env.VERSION }}.dmg s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
290-
aws s3 cp --acl=public-read Espressif-IDE-${{ env.VERSION }}-win32.win32.x86_64.zip s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/
290+
aws s3 cp --acl=public-read "com.espressif.idf.update-v$VERSION.zip" "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/"
291+
aws s3 cp --acl=public-read "artifacts/macos_x86/Espressif-IDE-macosx-cocoa-x86_64-v$VERSION.dmg" "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/"
292+
aws s3 cp --acl=public-read "artifacts/macos_arm/Espressif-IDE-macosx-cocoa-aarch64-v$VERSION.dmg" "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/"
293+
aws s3 cp --acl=public-read "Espressif-IDE-$VERSION-win32.win32.x86_64.zip" "s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/"
291294
292295
aws cloudfront create-invalidation --distribution-id ${{ secrets.DL_DISTRIBUTION_ID }} --paths "/dl/idf-eclipse-plugin/updates/latest/*"
293296
294-
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-win32.win32.x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-${{ env.VERSION }}-win32.win32.x86_64.zip"
297+
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-win32.win32.x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-$VERSION-win32.win32.x86_64.zip"
295298
296-
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64-v${{ env.VERSION }}.dmg"
299+
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64-v$VERSION.dmg"
297300
298-
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64-v${{ env.VERSION }}.dmg"
301+
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64-v$VERSION.dmg"
299302
300-
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-linux.gtk.x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-${{ env.VERSION }}-linux.gtk.x86_64.tar.gz"
303+
aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-linux.gtk.x86_64/latest" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-$VERSION-linux.gtk.x86_64.tar.gz"

0 commit comments

Comments
 (0)