From e132734be40f6e46a2f28ba0fc1de25755b1cdd9 Mon Sep 17 00:00:00 2001 From: Sandeep Datta Date: Wed, 7 Aug 2024 10:14:22 -0700 Subject: [PATCH] Removed all references to legate-gh-ci --- .github/actions/build/action.yml.j2 | 2 +- .github/actions/setup/action.yml | 12 +-------- .github/workflows/actions/setup/action.yml | 12 +-------- .github/workflows/gh-build-and-test.yml | 3 +-- .github/workflows/gh-build.yml | 27 +++++-------------- .../workflows/gh-test-within-container.yml | 17 ++---------- .../workflows/gh-test-without-container.yml | 17 ++---------- .github/workflows/gh-upload.yml | 17 ++---------- 8 files changed, 17 insertions(+), 90 deletions(-) diff --git a/.github/actions/build/action.yml.j2 b/.github/actions/build/action.yml.j2 index 49aff8e0..7f715a4f 100644 --- a/.github/actions/build/action.yml.j2 +++ b/.github/actions/build/action.yml.j2 @@ -32,7 +32,7 @@ runs: <% for package_id, package_info in packages.items() %> - name: Download <> (artifacts) - uses: ./legate-gh-ci/.github/actions/download-artifacts + uses: ./.github/actions/download-artifacts with: artifact-repo: "<>" artifact-name: "<>" diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 4d683ba3..22ac6758 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -13,9 +13,6 @@ inputs: platform: required: true type: string - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -29,13 +26,6 @@ inputs: runs: using: composite steps: - - name: Set LEGATE_GH_CI_DIR dir - shell: bash --noprofile --norc -xeuo pipefail {0} - run: | - cd legate-gh-ci - echo "LEGATE_GH_CI_DIR=$(pwd)" >> $GITHUB_ENV - env - - name: Checkout ${{ inputs.client-repo }} uses: actions/checkout@v4 with: @@ -54,7 +44,7 @@ runs: run: | WITH_TESTS_STR='' - if [[ ("${{ inputs.upload-enabled }}" == "false") && ("${{ inputs.build-type }}" != "ci") ]]; then + if [[ ("${{ inputs.upload-enabled }}" == "false") && ("${{ inputs.build-type }}" != "ci") ]]; then WITH_TESTS_STR='-with_tests' fi diff --git a/.github/workflows/actions/setup/action.yml b/.github/workflows/actions/setup/action.yml index 4d683ba3..22ac6758 100644 --- a/.github/workflows/actions/setup/action.yml +++ b/.github/workflows/actions/setup/action.yml @@ -13,9 +13,6 @@ inputs: platform: required: true type: string - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -29,13 +26,6 @@ inputs: runs: using: composite steps: - - name: Set LEGATE_GH_CI_DIR dir - shell: bash --noprofile --norc -xeuo pipefail {0} - run: | - cd legate-gh-ci - echo "LEGATE_GH_CI_DIR=$(pwd)" >> $GITHUB_ENV - env - - name: Checkout ${{ inputs.client-repo }} uses: actions/checkout@v4 with: @@ -54,7 +44,7 @@ runs: run: | WITH_TESTS_STR='' - if [[ ("${{ inputs.upload-enabled }}" == "false") && ("${{ inputs.build-type }}" != "ci") ]]; then + if [[ ("${{ inputs.upload-enabled }}" == "false") && ("${{ inputs.build-type }}" != "ci") ]]; then WITH_TESTS_STR='-with_tests' fi diff --git a/.github/workflows/gh-build-and-test.yml b/.github/workflows/gh-build-and-test.yml index 950794ed..91eb866a 100644 --- a/.github/workflows/gh-build-and-test.yml +++ b/.github/workflows/gh-build-and-test.yml @@ -20,7 +20,7 @@ jobs: build: if: ${{ github.repository_owner == 'nvidia' }} uses: - nv-legate/legate-gh-ci/.github/workflows/gh-build.yml@v1.10 + .github/workflows/gh-build.yml with: client-repo: ${{ github.event.repository.name }} target-device: ${{ inputs.target-device }} @@ -29,7 +29,6 @@ jobs: use-container: ${{ inputs.platform == 'linux-x64' || inputs.platform == 'linux-aarch64'}} platform: ${{ inputs.platform }} dependencies-file: "" - legate-gh-ci-tag: "v1.10" build-mode: ${{ inputs.build-mode }} upload-enabled: ${{ inputs.upload-enabled }} secrets: inherit diff --git a/.github/workflows/gh-build.yml b/.github/workflows/gh-build.yml index 467c9a5d..92f2f1ad 100644 --- a/.github/workflows/gh-build.yml +++ b/.github/workflows/gh-build.yml @@ -26,9 +26,6 @@ on: required: true type: string description: path to versions.json relative to the target repo dir - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -50,23 +47,13 @@ jobs: runs-on: ${{ inputs.runs-on }} steps: - - name: Checkout legate-gh-ci - uses: actions/checkout@v4 - with: - repository: 'nv-legate/legate-gh-ci' - ref: ${{ inputs.legate-gh-ci-tag }} - token: ${{ secrets.NV_LEGATE_INTER_REPOS_ACCESS_RO }} - fetch-depth: 0 - path: legate-gh-ci - - name: Setup - uses: ./legate-gh-ci/.github/actions/setup + uses: ./.github/actions/setup with: client-repo: ${{ inputs.client-repo }} build-type: ${{ inputs.build-type }} target-device: "${{ inputs.target-device }}" platform: ${{ inputs.platform }} - legate-gh-ci-tag: ${{ inputs.legate-gh-ci-tag }} build-mode: ${{ inputs.build-mode }} upload-enabled: ${{ inputs.upload-enabled }} python-version: ${{ inputs.python-version }} @@ -79,21 +66,21 @@ jobs: DEPENDENCIES_FILE="" if [ -z "${{ inputs.dependencies-file }}" ]; then - DEPENDENCIES_FILE="legate-gh-ci/no_dependencies.json" + DEPENDENCIES_FILE="${REPO_DIR}/continous_integration/no_dependencies.json" else - DEPENDENCIES_FILE="${{ inputs.client-repo }}/${{ inputs.dependencies-file }}" + DEPENDENCIES_FILE="${REPO_DIR}/${{ inputs.dependencies-file }}" fi - legate-gh-ci/scripts/render-template.py legate-gh-ci/.github/actions/build/action.yml.j2 "${DEPENDENCIES_FILE}" legate-gh-ci/.github/actions/build/action.yml + ${REPO_DIR}/continous_integration/scripts/render-template.py ${REPO_DIR}/.github/actions/build/action.yml.j2 "${DEPENDENCIES_FILE}" ${REPO_DIR}/.github/actions/build/action.yml - name: Dump templates shell: bash --noprofile --norc -xeuo pipefail {0} run: | - echo legate-gh-ci/.github/actions/build/action.yml - cat legate-gh-ci/.github/actions/build/action.yml + echo ${REPO_DIR}/.github/actions/build/action.yml + cat ${REPO_DIR}/.github/actions/build/action.yml - name: Call build action - uses: ./legate-gh-ci/.github/actions/build + uses: ./.github/actions/build with: build-type: ${{ inputs.build-type }} target-device: "${{ inputs.target-device }}" diff --git a/.github/workflows/gh-test-within-container.yml b/.github/workflows/gh-test-within-container.yml index 2235adac..efb928c2 100644 --- a/.github/workflows/gh-test-within-container.yml +++ b/.github/workflows/gh-test-within-container.yml @@ -28,9 +28,6 @@ on: platform: required: true type: string - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -58,29 +55,19 @@ jobs: shell: bash --noprofile --norc -xeuo pipefail {0} steps: - - name: Checkout legate-gh-ci - uses: actions/checkout@v4 - with: - repository: 'nv-legate/legate-gh-ci' - ref: ${{ inputs.legate-gh-ci-tag }} - token: ${{ secrets.NV_LEGATE_INTER_REPOS_ACCESS_RO }} - fetch-depth: 0 - path: legate-gh-ci - - name: Setup - uses: ./legate-gh-ci/.github/actions/setup + uses: ./.github/actions/setup with: client-repo: ${{ inputs.client-repo }} build-type: ${{ inputs.build-type }} target-device: "${{ inputs.target-device }}" platform: ${{ inputs.platform }} - legate-gh-ci-tag: ${{ inputs.legate-gh-ci-tag }} build-mode: ${{ inputs.build-mode }} upload-enabled: ${{ inputs.upload-enabled }} python-version: ${{ inputs.python-version }} - name: Call test action - uses: ./legate-gh-ci/.github/actions/test + uses: ./.github/actions/test with: test-options: ${{ inputs.test-options }} has-gpu: ${{ inputs.has-gpu }} diff --git a/.github/workflows/gh-test-without-container.yml b/.github/workflows/gh-test-without-container.yml index e062ffc4..9f72e2d6 100644 --- a/.github/workflows/gh-test-without-container.yml +++ b/.github/workflows/gh-test-without-container.yml @@ -28,9 +28,6 @@ on: platform: required: true type: string - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -52,29 +49,19 @@ jobs: shell: bash --noprofile --norc -xeuo pipefail {0} steps: - - name: Checkout legate-gh-ci - uses: actions/checkout@v4 - with: - repository: 'nv-legate/legate-gh-ci' - ref: ${{ inputs.legate-gh-ci-tag }} - token: ${{ secrets.NV_LEGATE_INTER_REPOS_ACCESS_RO }} - fetch-depth: 0 - path: legate-gh-ci - - name: Setup - uses: ./legate-gh-ci/.github/actions/setup + uses: ./.github/actions/setup with: client-repo: ${{ inputs.client-repo }} build-type: ${{ inputs.build-type }} target-device: "${{ inputs.target-device }}" platform: ${{ inputs.platform }} - legate-gh-ci-tag: ${{ inputs.legate-gh-ci-tag }} build-mode: ${{ inputs.build-mode }} upload-enabled: ${{ inputs.upload-enabled }} python-version: ${{ inputs.python-version }} - name: Call test action - uses: ./legate-gh-ci/.github/actions/test + uses: ./.github/actions/test with: test-options: ${{ inputs.test-options }} has-gpu: ${{ inputs.has-gpu }} diff --git a/.github/workflows/gh-upload.yml b/.github/workflows/gh-upload.yml index b2f21362..7e71b0ce 100644 --- a/.github/workflows/gh-upload.yml +++ b/.github/workflows/gh-upload.yml @@ -18,9 +18,6 @@ on: platform: required: true type: string - legate-gh-ci-tag: - required: true - type: string build-mode: required: true type: string @@ -59,29 +56,19 @@ jobs: shell: bash --noprofile --norc -xeuo pipefail {0} steps: - - name: Checkout legate-gh-ci - uses: actions/checkout@v4 - with: - repository: 'nv-legate/legate-gh-ci' - ref: ${{ inputs.legate-gh-ci-tag }} - token: ${{ secrets.NV_LEGATE_INTER_REPOS_ACCESS_RO }} - fetch-depth: 0 - path: legate-gh-ci - - name: Setup env variables - uses: ./legate-gh-ci/.github/actions/setup + uses: ./.github/actions/setup with: client-repo: ${{ inputs.client-repo }} build-type: ${{ inputs.build-type }} target-device: "${{ inputs.target-device }}" platform: ${{ inputs.platform }} - legate-gh-ci-tag: ${{ inputs.legate-gh-ci-tag }} build-mode: ${{ inputs.build-mode }} upload-enabled: ${{ inputs.upload-enabled }} python-version: ${{ inputs.python-version }} - name: Call upload action - uses: ./legate-gh-ci/.github/actions/upload + uses: ./.github/actions/upload with: urmToken: ${{ secrets.URM_ARTIFACT_TOKEN }} upload-action: ${{ inputs.upload-action }}