Betabuilds2 #949
Merged
Betabuilds2 #949
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WalkthroughThe changes across the Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- .github/workflows/ci_beta.yml (3 hunks)
Additional comments not posted (2)
.github/workflows/ci_beta.yml (2)
6-15: Update triggers to branches and pull requests targeting master.Ensure that the new triggers align with the intended workflow and that the workflow is correctly triggered on the specified events.
Verification successful
Workflow triggers are correctly configured
The workflow triggers in the
.github/workflows/ci_beta.ymlfile are correctly set to trigger on push and pull request events targeting themasterbranch.
- The
pushevent is configured to trigger on themasterbranch.- The
pull_requestevent is also configured to trigger on themasterbranch.Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the workflow triggers. # Test: Check the workflow file for the correct trigger configuration. rg --type yaml $'on:\n push:\n branches: \[ master \]\n pull_request:\n branches: \[ master \]' .github/workflows/ci_beta.ymlLength of output: 322
Script:
#!/bin/bash # Description: Verify the workflow triggers with multiline support. # Test: Check the workflow file for the correct trigger configuration using multiline mode. rg --multiline --type yaml $'on:\n push:\n branches: \[ master \]\n pull_request:\n branches: \[ master \]' .github/workflows/ci_beta.ymlLength of output: 220
71-89: Update notarization steps forEspressif-IDE-macosx-cocoa-x86_64.dmg.Ensure that the notarization steps are correctly configured and that the commented-out sections are intentional and documented.
Verification successful
Update notarization steps for
Espressif-IDE-macosx-cocoa-x86_64.dmg.The notarization steps are correctly configured in the workflow file. The commented-out sections are intentional and documented.
Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify the notarization steps. # Test: Check the workflow file for the correct notarization configuration. rg --type yaml $' - name: Notarize Espressif-IDE-macosx-cocoa-x86_64.dmg\n env: \n NOTARIZATION_USERNAME: \${{ secrets.NOTARIZATION_USERNAME }}\n NOTARIZATION_PASSWORD: \${{ secrets.NOTARIZATION_PASSWORD }}\n run: |\n echo "Create keychain profile"\n xcrun notarytool store-credentials "ide-notarytool-profile" --apple-id "\$NOTARIZATION_USERNAME" --team-id "\$NOTARIZATION_TEAM_ID" --password "\$NOTARIZATION_PASSWORD"\n echo "Notarization of Espressif-IDE-macosx-cocoa-x86_64.dmg"\n xcrun notarytool submit \$PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg --keychain-profile "ide-notarytool-profile" --wait\n echo "Attach staple"\n xcrun stapler staple \$PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg' .github/workflows/ci_beta.ymlLength of output: 1928
Script:
#!/bin/bash # Description: Verify the notarization steps. # Test: Check the workflow file for the correct notarization configuration. rg --type yaml 'name: Notarize Espressif-IDE-macosx-cocoa-x86_64.dmg' .github/workflows/ci_beta.yml -A 10Length of output: 1385
| @@ -29,7 +34,7 @@ jobs: | |||
| export JARSIGNER_ALIAS=${{secrets.JARSIGNER_REL_ALIAS}} | |||
| KEYSTORE_FILE="${PWD}/{{secrets.JARSIGNER_KEYSTORE}}" | |||
| echo "${KEYSTORE_FILE}" | |||
| printf "%s" "${JARSIGNER_KEYSTORE_B64}" | base64 -d - > "${KEYSTORE_FILE}" | |||
| printf "%s" "${JARSIGNER_KEYSTORE_B64}" | base64 -d > "${KEYSTORE_FILE}" | |||
There was a problem hiding this comment.
Ensure secure handling of secrets.
The secrets are being handled securely, but ensure that the KEYSTORE_FILE is properly cleaned up after use to avoid any potential security risks.
- rm -v "${KEYSTORE_FILE}"
+ shred -u "${KEYSTORE_FILE}"Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
Suggested change
| printf "%s" "${JARSIGNER_KEYSTORE_B64}" | base64 -d > "${KEYSTORE_FILE}" | |
| printf "%s" "${JARSIGNER_KEYSTORE_B64}" | base64 -d > "${KEYSTORE_FILE}" | |
| shred -u "${KEYSTORE_FILE}" |
.github/workflows/ci_beta.yml
Outdated
Comment on lines
99
to
172
| name: espressif-ide-win32 | ||
| path: releng/com.espressif.idf.product/target/products/Espressif-IDE-*-win32.win32.x86_64.zip | ||
| # - name: Upload windows rcp | ||
| # if: ${{ !cancelled() }} | ||
| # uses: actions/upload-artifact@v2 | ||
| # with: | ||
| # name: espressif-ide-win32 | ||
| # path: releng/com.espressif.idf.product/target/products/Espressif-IDE-*-win32.win32.x86_64.zip | ||
|
|
||
| - name: Upload linux rcp | ||
| if: ${{ !cancelled() }} | ||
| uses: actions/upload-artifact@v2 | ||
| with: | ||
| name: espressif-ide-linux | ||
| path: releng/com.espressif.idf.product/target/products/Espressif-IDE-*-linux.gtk.x86_64.tar.gz | ||
| # - name: Upload linux rcp | ||
| # if: ${{ !cancelled() }} | ||
| # uses: actions/upload-artifact@v2 | ||
| # with: | ||
| # name: espressif-ide-linux | ||
| # path: releng/com.espressif.idf.product/target/products/Espressif-IDE-*-linux.gtk.x86_64.tar.gz | ||
|
|
||
|
|
||
| - name: Upload build assets to dl.espressif.com | ||
| id: upload-release-asset-espressif | ||
| env: | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} | ||
| run: | | ||
| ARCHIVE_DIR="/releng/com.espressif.idf.update/target/" | ||
| ARCHIVE_NAME="com.espressif.idf.update*.zip" | ||
| echo "${ARCHIVE_DIR}" | ||
| echo ${PWD}${ARCHIVE_DIR} | ||
| ARCHIVE_FILE_NAME="$(find ${PWD}${ARCHIVE_DIR}${ARCHIVE_NAME})" | ||
| echo "${ARCHIVE_FILE_NAME}" | ||
| ARCHIVE_PREFIX="com.espressif.idf.update-" | ||
| ARCHIVE_SUFFIX="-SNAPSHOT.zip"; | ||
| tmp=${ARCHIVE_FILE_NAME#*${ARCHIVE_PREFIX}} # remove prefix | ||
| ARCHIVE_VERSION=${tmp%${ARCHIVE_SUFFIX}*} # remove suffix | ||
| echo "${ARCHIVE_VERSION}" | ||
| FOLDER_NAME="v${ARCHIVE_VERSION}-beta" | ||
| mkdir "${FOLDER_NAME}" && cd "${FOLDER_NAME}" && unzip -q ${ARCHIVE_FILE_NAME} && cd .. | ||
| echo ${PWD} | ||
| ARCHIVE_VERSION_NEW="${ARCHIVE_PREFIX}${ARCHIVE_VERSION}.zip" | ||
| echo ${ARCHIVE_VERSION_NEW} | ||
| mv ${ARCHIVE_FILE_NAME} ${ARCHIVE_VERSION_NEW} | ||
| mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg" | ||
| mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg" | ||
| aws s3 rm s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta --recursive | ||
| aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta | ||
| aws s3 cp --acl=public-read "./releng/index.html" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta/ | ||
| aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/${FOLDER_NAME} | ||
| aws s3 cp --acl=public-read --recursive --exclude "*" --include "Espressif-IDE-*" ./releng/com.espressif.idf.product/target/products/ s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| aws s3 cp --acl=public-read "${ARCHIVE_VERSION_NEW}" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/ | ||
| aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| aws cloudfront create-invalidation --distribution-id ${{ secrets.DL_DISTRIBUTION_ID }} --paths "/dl/idf-eclipse-plugin/updates/beta/*" | ||
| aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-win32.win32.x86_64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-${ARCHIVE_VERSION}-win32.win32.x86_64.zip" | ||
| aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64-v${ARCHIVE_VERSION}.dmg" | ||
| aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64-v${ARCHIVE_VERSION}.dmg" | ||
| aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-linux.gtk.x86_64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-${ARCHIVE_VERSION}-linux.gtk.x86_64.tar.gz" | ||
| # - name: Upload build assets to dl.espressif.com | ||
| # id: upload-release-asset-espressif | ||
| # env: | ||
| # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| # AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }} | ||
| # run: | | ||
| # ARCHIVE_DIR="/releng/com.espressif.idf.update/target/" | ||
| # ARCHIVE_NAME="com.espressif.idf.update*.zip" | ||
| # echo "${ARCHIVE_DIR}" | ||
| # echo ${PWD}${ARCHIVE_DIR} | ||
| # ARCHIVE_FILE_NAME="$(find ${PWD}${ARCHIVE_DIR}${ARCHIVE_NAME})" | ||
| # echo "${ARCHIVE_FILE_NAME}" | ||
| # ARCHIVE_PREFIX="com.espressif.idf.update-" | ||
| # ARCHIVE_SUFFIX="-SNAPSHOT.zip"; | ||
| # tmp=${ARCHIVE_FILE_NAME#*${ARCHIVE_PREFIX}} # remove prefix | ||
| # ARCHIVE_VERSION=${tmp%${ARCHIVE_SUFFIX}*} # remove suffix | ||
| # echo "${ARCHIVE_VERSION}" | ||
| # FOLDER_NAME="v${ARCHIVE_VERSION}-beta" | ||
| # mkdir "${FOLDER_NAME}" && cd "${FOLDER_NAME}" && unzip -q ${ARCHIVE_FILE_NAME} && cd .. | ||
| # echo ${PWD} | ||
| # ARCHIVE_VERSION_NEW="${ARCHIVE_PREFIX}${ARCHIVE_VERSION}.zip" | ||
| # echo ${ARCHIVE_VERSION_NEW} | ||
| # mv ${ARCHIVE_FILE_NAME} ${ARCHIVE_VERSION_NEW} | ||
| # mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg" | ||
| # mv releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg "releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg" | ||
| # aws s3 rm s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta --recursive | ||
| # aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta | ||
| # aws s3 cp --acl=public-read "./releng/index.html" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/beta/ | ||
| # aws s3 cp --acl=public-read --recursive "./${FOLDER_NAME}/" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/${FOLDER_NAME} | ||
| # aws s3 cp --acl=public-read --recursive --exclude "*" --include "Espressif-IDE-*" ./releng/com.espressif.idf.product/target/products/ s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| # aws s3 cp --acl=public-read "${ARCHIVE_VERSION_NEW}" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/updates/ | ||
| # aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-x86_64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| # aws s3 cp --acl=public-read "./releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64-${FOLDER_NAME}.dmg" s3://${{ secrets.DL_BUCKET }}/dl/idf-eclipse-plugin/ide/ | ||
| # aws cloudfront create-invalidation --distribution-id ${{ secrets.DL_DISTRIBUTION_ID }} --paths "/dl/idf-eclipse-plugin/updates/beta/*" | ||
| # aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-win32.win32.x86_64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-${ARCHIVE_VERSION}-win32.win32.x86_64.zip" | ||
| # aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-x86_64-v${ARCHIVE_VERSION}.dmg" | ||
| # aws s3api put-object --acl=public-read --bucket espdldata --key "dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64/beta" --website-redirect-location "/dl/idf-eclipse-plugin/ide/Espressif-IDE-macosx-cocoa-aarch64-v${ARCHIVE_VERSION}.dmg" |
There was a problem hiding this comment.
Document the reason for commented-out sections.
Consider adding comments explaining why these sections are commented out to provide context for future maintainers.
# - name: Notarize Espressif-IDE-macosx-cocoa-aarch64.dmg
# env:
# NOTARIZATION_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
# NOTARIZATION_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
# run: |
# echo "Notarization of Espressif-IDE-macosx-cocoa-aarch64.dmg"
# xcrun altool --notarize-app -f $PWD/releng/ide-dmg-builder/Espressif-IDE-macosx-cocoa-aarch64.dmg -u $NOTARIZATION_USERNAME -p $NOTARIZATION_PASSWORD --primary-bundle-id Espressif-IDE.app
# # Commented out because...
There was a problem hiding this comment.
Actionable comments posted: 0
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (1)
- .github/workflows/ci_beta.yml (3 hunks)
Files skipped from review as they are similar to previous changes (1)
- .github/workflows/ci_beta.yml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed.
Fixes # (IEP-XXX)
Type of change
Please delete options that are not relevant.
How has this been tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Dependent components impacted by this PR:
Checklist
Summary by CodeRabbit
masterbranch and pull requests tomaster.