From 0cda47c60c54a88f28d013160df21ca97c6999f6 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Fri, 4 Oct 2024 13:08:58 -0700 Subject: [PATCH] chore(ci): Update install.sh workflow to not publish to AWS (#21412) * chore(ci): Update install.sh workflow to not publish to AWS We no longer host install.sh in AWS S3 but instead reference it from GitHub. This change happened a while ago, but we apparently never updated the CI wrokflow; we just never noticed since we haven't changed the script since then. Signed-off-by: Jesse Szwedko * readd missing steps Signed-off-by: Jesse Szwedko * whitespace Signed-off-by: Jesse Szwedko * Remove duplicate step Signed-off-by: Jesse Szwedko --------- Signed-off-by: Jesse Szwedko --- .github/workflows/install-sh.yml | 34 ++++---------------------------- Makefile | 4 ---- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml index edc14cd22012b..9b0ed5550346c 100644 --- a/.github/workflows/install-sh.yml +++ b/.github/workflows/install-sh.yml @@ -5,10 +5,9 @@ on: workflow_dispatch: jobs: - - sync-install: + test-install: runs-on: ubuntu-20.04 - timeout-minutes: 10 + timeout-minutes: 5 steps: - name: (PR comment) Get PR branch if: ${{ github.event_name == 'issue_comment' }} @@ -34,35 +33,10 @@ jobs: if: ${{ github.event_name != 'issue_comment' }} uses: actions/checkout@v3 - - run: pip3 install awscli --upgrade --user - - env: - AWS_ACCESS_KEY_ID: "${{ secrets.CI_AWS_ACCESS_KEY_ID }}" - AWS_SECRET_ACCESS_KEY: "${{ secrets.CI_AWS_SECRET_ACCESS_KEY }}" - run: make sync-install - - - name: (PR comment) Set latest commit status as failed - uses: myrotvorets/set-commit-status-action@v2.0.1 - if: failure() && github.event_name == 'issue_comment' - with: - sha: ${{ steps.comment-branch.outputs.head_sha }} - token: ${{ secrets.GITHUB_TOKEN }} - context: Update install.sh Suite - status: 'failure' - - test-install: - needs: sync-install - runs-on: ubuntu-20.04 - timeout-minutes: 5 - steps: - - run: sudo apt-get install --yes curl bc - - run: curl --proto '=https' --tlsv1.2 -sSfL https://sh.vector.dev | bash -s -- -y + - run: sudo apt-get install --yes bc + - run: bash distribution/install.sh -- -y - run: ~/.vector/bin/vector --version - - name: (PR comment) Get PR branch - if: github.event_name == 'issue_comment' - uses: xt0rted/pull-request-comment-branch@v2 - id: comment-branch - - name: (PR comment) Set latest commit status as ${{ job.status }} if: github.event_name == 'issue_comment' uses: myrotvorets/set-commit-status-action@v2.0.1 diff --git a/Makefile b/Makefile index 96e83bc169e13..afe737044b878 100644 --- a/Makefile +++ b/Makefile @@ -645,10 +645,6 @@ release-push: ## Push new Vector version release-s3: ## Release artifacts to S3 @cargo vdev release s3 -.PHONY: sync-install -sync-install: ## Sync the install.sh script for access via sh.vector.dev - @aws s3 cp distribution/install.sh s3://sh.vector.dev --sse --acl public-read - .PHONY: sha256sum sha256sum: ## Generate SHA256 checksums of CI artifacts scripts/checksum.sh