From caffc20321bf77a6796b0230fae170fff598c396 Mon Sep 17 00:00:00 2001 From: Arjun Raja Yogidas Date: Tue, 28 May 2024 14:07:04 +0000 Subject: [PATCH] add codebuild specific changes to workflows Signed-off-by: Arjun Raja Yogidas --- .github/workflows/benchmark_visualization.yml | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/bump-deps.yml | 2 +- .github/workflows/comparision-test.yml | 2 +- .github/workflows/prebuild.yml | 11 ++++++----- .github/workflows/releases.yml | 9 ++++++--- scripts/check-ltag.sh | 1 + 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/benchmark_visualization.yml b/.github/workflows/benchmark_visualization.yml index 21993d0af..818b25756 100644 --- a/.github/workflows/benchmark_visualization.yml +++ b/.github/workflows/benchmark_visualization.yml @@ -17,7 +17,7 @@ env: jobs: benchmark: - runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} steps: - name: Checkout main branch uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: path: ${{github.workspace}}/benchmark/performanceTest/output/results.json download-and-convert-benchmark-result-to-visualization-data: - runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} needs: benchmark steps: - name: Checkout main branch @@ -67,7 +67,7 @@ jobs: push-benchmark-result-gh-pages: name: Push benchmark result to Github-pages - runs-on: codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-visualization-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} needs: download-and-convert-benchmark-result-to-visualization-data strategy: matrix: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20b1f4640..11cf2ecba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ env: jobs: test: - runs-on: codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} timeout-minutes: 15 steps: - uses: actions/checkout@v4 @@ -34,7 +34,7 @@ jobs: - run: make - run: make test integration: - runs-on: codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-build-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} timeout-minutes: 40 strategy: fail-fast: false diff --git a/.github/workflows/bump-deps.yml b/.github/workflows/bump-deps.yml index 8f9bc22b4..36ed0fb83 100644 --- a/.github/workflows/bump-deps.yml +++ b/.github/workflows/bump-deps.yml @@ -20,7 +20,7 @@ jobs: # Don't bother bumping deps on forks. if: ${{ github.repository == 'awslabs/soci-snapshotter' || github.event_name == 'workflow_dispatch' }} - runs-on: codebuild-soci-bump-dependencies-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/comparision-test.yml b/.github/workflows/comparision-test.yml index 8033c8b8e..d0eee9289 100644 --- a/.github/workflows/comparision-test.yml +++ b/.github/workflows/comparision-test.yml @@ -9,7 +9,7 @@ env: jobs: check: - runs-on: codebuild-soci-comparision-test-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ${{ 'github.event.pull_request.head.repo.fork ' && 'ubuntu-22.04' || 'codebuild-soci-comparision-test-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge' }} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml index 7c7bc8ef8..dd349217c 100644 --- a/.github/workflows/prebuild.yml +++ b/.github/workflows/prebuild.yml @@ -12,7 +12,7 @@ env: jobs: check: - runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: @@ -32,7 +32,7 @@ jobs: - run: PATH=$PATH:$(pwd) ./scripts/check-flatc.sh git-secrets: - runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small + runs-on: ubuntu-22.04 steps: - name: Pull latest awslabs/git-secrets repo uses: actions/checkout@v4 @@ -54,7 +54,7 @@ jobs: strategy: matrix: working_dir: ['.', 'cmd'] - runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6 @@ -64,13 +64,14 @@ jobs: yamllint: name: yamllint-lint - runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + - run: pip install yamllint - run: yamllint . shellcheck: - runs-on: codebuild-soci-prebuild-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-small + runs-on: ubuntu-22.04 container: koalaman/shellcheck-alpine:v0.10.0 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index fd42c2a18..b5dbe8a94 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -20,7 +20,7 @@ permissions: jobs: generate-artifacts: - runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ubuntu-22.04 env: # Set during setup. RELEASE_TAG: '' @@ -28,6 +28,9 @@ jobs: STATIC_BINARY_NAME: '' steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: ${{ env.GO_VERSION }} - name: Export cleaned release tag run: | export release_tag=${GITHUB_REF#refs/*/} # Strip down to raw tag name @@ -60,7 +63,7 @@ jobs: validate-artifacts: needs: generate-artifacts - runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 @@ -72,7 +75,7 @@ jobs: create-release: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') needs: [generate-artifacts, validate-artifacts] - runs-on: codebuild-soci-release-workflow-${{ github.run_id }}-${{ github.run_attempt }}-ubuntu-7.0-xlarge + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/download-artifact@v4 diff --git a/scripts/check-ltag.sh b/scripts/check-ltag.sh index 6072df430..3e1c67c20 100755 --- a/scripts/check-ltag.sh +++ b/scripts/check-ltag.sh @@ -19,6 +19,7 @@ set -eux -o pipefail CUR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" SOCI_SNAPSHOTTER_PROJECT_ROOT="${CUR_DIR}/.." + # check ltag pushd "${SOCI_SNAPSHOTTER_PROJECT_ROOT}" "$(go env GOPATH)"/bin/ltag -t "${SOCI_SNAPSHOTTER_PROJECT_ROOT}/.headers" -check -v || (echo "The files listed above are missing a licence header. Please run ./scripts/add-ltag.sh"; exit 1)