From 929af7772e08b8f7cef341457b47699099f3fbcd Mon Sep 17 00:00:00 2001 From: Jimmy Royer Date: Mon, 9 Sep 2024 13:45:53 -0400 Subject: [PATCH] Formatting --- .../workflows/backstage-catalog-helper.yml | 12 ++--- .github/workflows/s3-backup.yml | 49 +++++++++---------- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/.github/workflows/backstage-catalog-helper.yml b/.github/workflows/backstage-catalog-helper.yml index 2ed8456..47aee8d 100644 --- a/.github/workflows/backstage-catalog-helper.yml +++ b/.github/workflows/backstage-catalog-helper.yml @@ -28,10 +28,10 @@ jobs: uses: peter-evans/create-pull-request@v3 with: token: ${{ steps.generate_token.outputs.token}} - commit-message: 'Add catalog-info.yaml' - branch: 'backstage/catalog-info' - title: 'Add catalog-info.yaml' - body: 'Adding a basic catalog-info.yaml to start populating the backstage catalog with your components.' - labels: 'backstage' + commit-message: "Add catalog-info.yaml" + branch: "backstage/catalog-info" + title: "Add catalog-info.yaml" + body: "Adding a basic catalog-info.yaml to start populating the backstage catalog with your components." + labels: "backstage" add-paths: | - catalog-info.yaml \ No newline at end of file + catalog-info.yaml diff --git a/.github/workflows/s3-backup.yml b/.github/workflows/s3-backup.yml index 6a8e967..82be373 100644 --- a/.github/workflows/s3-backup.yml +++ b/.github/workflows/s3-backup.yml @@ -8,32 +8,31 @@ jobs: s3-backup: runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + fetch-depth: 0 # retrieve all history - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - with: - fetch-depth: 0 # retrieve all history + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 + with: + aws-access-key-id: ${{ secrets.AWS_S3_BACKUP_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_S3_BACKUP_SECRET_ACCESS_KEY }} + aws-region: ca-central-1 - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2 - with: - aws-access-key-id: ${{ secrets.AWS_S3_BACKUP_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_S3_BACKUP_SECRET_ACCESS_KEY }} - aws-region: ca-central-1 + - name: Create ZIP bundle + run: | + ZIP_FILE=`basename ${{ github.repository }}`-`date '+%Y-%m-%d'`.zip + zip -rq "${ZIP_FILE}" . + mkdir -p ${{ github.repository }} + mv "${ZIP_FILE}" ${{ github.repository }} - - name: Create ZIP bundle - run: | - ZIP_FILE=`basename ${{ github.repository }}`-`date '+%Y-%m-%d'`.zip - zip -rq "${ZIP_FILE}" . - mkdir -p ${{ github.repository }} - mv "${ZIP_FILE}" ${{ github.repository }} + - name: Upload to S3 bucket + run: | + aws s3 sync . s3://${{ secrets.AWS_S3_BACKUP_BUCKET }} --exclude='*' --include='${{ github.repository }}/*' - - name: Upload to S3 bucket - run: | - aws s3 sync . s3://${{ secrets.AWS_S3_BACKUP_BUCKET }} --exclude='*' --include='${{ github.repository }}/*' - - - name: Notify Slack channel if this job failed - if: ${{ failure() }} - run: | - json='{"text":"S3 backup failed in !"}' - curl -X POST -H 'Content-type: application/json' --data "$json" ${{ secrets.SLACK_NOTIFY_WEBHOOK }} + - name: Notify Slack channel if this job failed + if: ${{ failure() }} + run: | + json='{"text":"S3 backup failed in !"}' + curl -X POST -H 'Content-type: application/json' --data "$json" ${{ secrets.SLACK_NOTIFY_WEBHOOK }}