From d59e612c56b8bba5e65b08934bf928304842d2f7 Mon Sep 17 00:00:00 2001 From: Eric Villa Date: Wed, 13 Sep 2023 17:33:14 +0200 Subject: [PATCH] chore: fixed approval workflow --- .../desktop-app-cd-nightly-approval.yml | 28 ----- .../workflows/desktop-app-cd-nightly-prod.yml | 112 +++++++++--------- 2 files changed, 58 insertions(+), 82 deletions(-) diff --git a/.github/workflows/desktop-app-cd-nightly-approval.yml b/.github/workflows/desktop-app-cd-nightly-approval.yml index 9211fedf5..2aac56b21 100644 --- a/.github/workflows/desktop-app-cd-nightly-approval.yml +++ b/.github/workflows/desktop-app-cd-nightly-approval.yml @@ -91,13 +91,6 @@ jobs: rm "./release/Leapp-$TAG_VERSION-win.zip" ||: powershell "Compress-Archive './release/Leapp Setup $TAG_VERSION.exe' './release/Leapp-$TAG_VERSION-win.zip'" - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - name: Prepare tag version for artifact upload id: release shell: bash @@ -144,13 +137,6 @@ jobs: rm -Rf ./release/builder-debug.yml rm -Rf ./release/builder-effective-config.yaml - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - name: Prepare tag version for artifact upload id: release run: | @@ -217,13 +203,6 @@ jobs: rm "./release/Leapp-$TAG_VERSION-mac.zip.blockmap" zip "./release/Leapp-$TAG_VERSION-mac.zip" "./release/Leapp-$TAG_VERSION.dmg" - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - name: Prepare tag version for artifact upload id: release run: | @@ -285,13 +264,6 @@ jobs: rm "./release/Leapp-$TAG_VERSION-arm64-mac.zip.blockmap" zip "./release/Leapp-$TAG_VERSION-mac-arm64.zip" "./release/Leapp-$TAG_VERSION-arm64.dmg" - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - name: Prepare tag version for artifact upload id: release run: | diff --git a/.github/workflows/desktop-app-cd-nightly-prod.yml b/.github/workflows/desktop-app-cd-nightly-prod.yml index 05fce8e77..56ccea22d 100644 --- a/.github/workflows/desktop-app-cd-nightly-prod.yml +++ b/.github/workflows/desktop-app-cd-nightly-prod.yml @@ -76,6 +76,7 @@ jobs: ref: main token: ${{ secrets.GH_TOKEN }} path: leapp-team + - name: Inject Team Feature if: ${{ env.TEAM_REPOSITORY != '' }} run: | @@ -98,21 +99,19 @@ jobs: rm "./release/Leapp-$TAG_VERSION-win.zip" ||: powershell "Compress-Archive './release/Leapp Setup $TAG_VERSION.exe' './release/Leapp-$TAG_VERSION-win.zip'" - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Release draft to S3 (nightly) + - name: Prepare tag version for artifact upload + id: release shell: bash run: | cd packages/desktop-app - TAG_VERSION=$(cat nightly-version) - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/" --recursive - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/latest-temp/" --recursive + echo "::set-output name=TAG_VERSION::$TAG_VERSION" + + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: Leapp-${{ steps.release.outputs.TAG_VERSION }}-win.zip + path: packages/desktop-app/release/Leapp-${{ steps.release.outputs.TAG_VERSION }}-win.zip build-linux: runs-on: ubuntu-latest @@ -121,6 +120,7 @@ jobs: - uses: actions/checkout@v3 with: ref: master + - uses: actions/checkout@v3 if: ${{ env.TEAM_REPOSITORY != '' }} with: @@ -128,6 +128,7 @@ jobs: ref: main token: ${{ secrets.GH_TOKEN }} path: leapp-team + - name: Inject Team Feature if: ${{ env.TEAM_REPOSITORY != '' }} run: | @@ -146,19 +147,24 @@ jobs: rm -Rf ./release/builder-debug.yml rm -Rf ./release/builder-effective-config.yaml - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Release draft to S3 (nightly) + - name: Prepare tag version for artifact upload + id: release run: | cd packages/desktop-app TAG_VERSION=$(cat nightly-version) - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/" --recursive - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/latest-temp/" --recursive + echo "::set-output name=TAG_VERSION::$TAG_VERSION" + + - name: Upload artifacts (.deb) + uses: actions/upload-artifact@v3 + with: + name: Leapp-${{ steps.release.outputs.TAG_VERSION }}_amd64.deb + path: packages/desktop-app/release/Leapp_${{ steps.release.outputs.TAG_VERSION }}_amd64.deb + + - name: Upload artifacts (.AppImage) + uses: actions/upload-artifact@v3 + with: + name: Leapp-${{ steps.release.outputs.TAG_VERSION }}.AppImage + path: packages/desktop-app/release/Leapp-${{ steps.release.outputs.TAG_VERSION }}.AppImage build-macos-x64: runs-on: macos-latest @@ -231,19 +237,18 @@ jobs: rm "./release/Leapp-$TAG_VERSION-mac.zip.blockmap" zip "./release/Leapp-$TAG_VERSION-mac.zip" "./release/Leapp-$TAG_VERSION.dmg" - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Release draft to S3 (nightly) + - name: Prepare tag version for artifact upload + id: release run: | cd packages/desktop-app TAG_VERSION=$(cat nightly-version) - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/" --recursive - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/latest-temp/" --recursive + echo "::set-output name=TAG_VERSION::$TAG_VERSION" + + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: Leapp-${{ steps.release.outputs.TAG_VERSION }}.dmg + path: packages/desktop-app/release/Leapp-${{ steps.release.outputs.TAG_VERSION }}.dmg build-macos-arm: @@ -318,33 +323,32 @@ jobs: rm "./release/Leapp-$TAG_VERSION-arm64-mac.zip.blockmap" zip "./release/Leapp-$TAG_VERSION-mac-arm64.zip" "./release/Leapp-$TAG_VERSION-arm64.dmg" - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Release draft to S3 (nightly) + - name: Prepare tag version for artifact upload + id: release run: | cd packages/desktop-app TAG_VERSION=$(cat nightly-version) - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/" --recursive - aws s3 cp ./release/ "${{ env.S3_BUCKET }}/nightly/latest-temp/" --recursive + echo "::set-output name=TAG_VERSION::$TAG_VERSION" - publish-nightly-draft: + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: Leapp-${{ steps.release.outputs.TAG_VERSION }}-arm64.dmg + path: packages/desktop-app/release/Leapp-${{ steps.release.outputs.TAG_VERSION }}-arm64.dmg + + post-to-slack: runs-on: ubuntu-latest - needs: [ build-linux, build-win, build-macos-arm, build-macos-x64 ] + needs: [ build-win, build-linux, build-macos-x64, build-macos-arm ] steps: - - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 + - name: Post to Slack + id: slack + uses: slackapi/slack-github-action@v1.24.0 with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: eu-west-1 - - - name: Move draft to nightly latest - run: | - aws s3 rm "${{ env.S3_BUCKET }}/nightly/latest" --recursive - aws s3 mv "${{ env.S3_BUCKET }}/nightly/latest-temp/" "${{ env.S3_BUCKET }}/nightly/latest" --recursive + # Slack channel id, channel name, or user id to post message. + # See also: https://api.slack.com/methods/chat.postMessage#channels + # You can pass in multiple channels to post to by providing a comma-delimited list of channel IDs. + channel-id: "C05S4TSQ919" + # For posting a simple plain text message + slack-message: "${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} approval builds: https://github.com/Noovolari/leapp/actions/runs/${{ github. run_id }}" + env: + SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }}