Use CI

nv-legate · Jan 9, 2024 · 8cdaae4 · 8cdaae4
1 parent b752ef9
commit 8cdaae4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/.github/workflows/ci-gh-build-nightly-release.yml b/.github/workflows/ci-gh-build-nightly-release.yml
@@ -27,7 +27,7 @@ jobs:
       repos-name: ${{ github.event.repository.name }}
       runs-on: ${{ github.repository_owner == 'nv-legate' && 'linux-amd64-cpu16' || 'ubuntu-latest' }}
       sha: ${{ github.sha }}
-      build-type: nightly-release
+      build-type: ci
       use-container: true
       ucx-config: ucx
       ucx-string: '-ucx'
@@ -41,12 +41,21 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Pytest Unit Tests
-            test-scope: unit
-            runner: linux-amd64-gpu-v100-latest-1
-          - name: Pytest Unit Tests
-            test-scope: unit
-            runner: linux-amd64-2gpu4
+        - name: Python Unit Tests
+          test-scope: python
+          runner: linux-amd64-gpu-v100-latest-1
+
+        - name: Python Unit Tests
+          test-scope: python
+          runner: linux-amd64-2gpu
+
+        - name: C++ Unit Tests
+          test-scope: cpp
+          runner: linux-amd64-gpu-v100-latest-1
+
+        - name: C++ Unit Tests
+          test-scope: cpp
+          runner: linux-amd64-2gpu
 
     name: ${{ matrix.name }}
     uses:
@@ -93,6 +102,6 @@ jobs:
           for pkgFile in ~/artifact/$ARTIFACT_NAME/*; do 
             echo "File to upload = $pkgFile"
             if [ "${pkgFile##*.}" = "bz2" ]; then
-              anaconda -t $CHANNEL_TOKEN upload --skip-existing -u legate-nightly $pkgFile
+              echo anaconda -t $CHANNEL_TOKEN upload --skip-existing -u legate-nightly $pkgFile
             fi
           done
diff --git a/.github/workflows/gh-build.yml b/.github/workflows/gh-build.yml
@@ -37,6 +37,7 @@ on:
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   USE_CUDA: ${{ (inputs.build-target == 'cpu' && 'OFF') || 'ON' }}
+  NIGHTLY_RELEASE_BUILD: ${{ (inputs.nightly-string == '-nightly' && 'ON') || 'OFF' }}
   ARTIFACTS_DIR: "${{ github.workspace }}/.artifacts"
   ARTIFACT_NAME: "${{ inputs.repos-name }}-${{ inputs.build-target }}${{ inputs.ucx-string }}${{ inputs.nightly-string }}-${{ inputs.sha }}"
   UCX_ENABLED: ${{ (inputs.ucx-config == 'ucx' && 'ON') || 'OFF' }}
@@ -82,6 +83,7 @@ jobs:
             -e GITHUB_TOKEN \
             -e USE_CUDA \
             -e UCX_ENABLED \
+            -e NIGHTLY_RELEASE_BUILD \
             -v "$(pwd):$(pwd)" \
             -v "$ARTIFACTS_DIR:$(pwd)/.artifacts" \
             --rm "condaforge/miniforge3:latest" \

diff --git a/continuous_integration/scripts/build-legate b/continuous_integration/scripts/build-legate
@@ -88,15 +88,6 @@ copy_docs_artifacts() {
     cp -r $REPO_DIR/docs/legate/core/build/html/* "$ARTIFACTS_DIR/."
 }
 
-post_nightly_release_artifacts() {
-    echo Copying release artifacts
-    cp /tmp/conda-build/linux-64/legate-core-*.tar.bz2 "$ARTIFACTS_DIR"
-    echo "NIGHTLY -PRGX"
-    conda install -c anaconda anaconda-client
-    anaconda -V
-    anaconda -t $CHANNEL_TOKEN upload --skip-existing -u legate-nightly /tmp/conda-build/linux-64/legate-core-*.tar.bz2
-}
-
 build_docs() {
     set -x;
     cd $REPO_DIR;
@@ -137,7 +128,6 @@ build_legate() {
         ci) build_legate_ci && copy_ci_artifacts;;
         release) build_legate_release && copy_release_artifacts;;
         docs) build_docs && copy_docs_artifacts;;
-        nightly-release) build_legate_nightly_release && copy_release_artifacts;;
         *) return 1;;
     esac
 }

diff --git a/continuous_integration/scripts/build-legate-conda b/continuous_integration/scripts/build-legate-conda
@@ -35,6 +35,9 @@ build_legate_conda_package() {
     UCX_CONFIGURED=true
     [ "${UCX_ENABLED:-}" = "OFF" ] && UCX_CONFIGURED=false
 
+    NIGHTLY_RELEASE_ENABLED=false
+    [ "${NIGHTLY_RELEASE_BUILD:-}" = "ON" ] && NIGHTLY_RELEASE_ENABLED=true
+
     conda_build_args+=(--variants "{gpu_enabled:${GPU_ENABLED},python:${python_version},ucx_configured:${UCX_CONFIGURED}}");
 
     rm -rf /tmp/conda-croot/legate_core;
@@ -63,6 +66,8 @@ package_version:
   - "$(git -C $REPO_DIR describe --abbrev=0 --tags | $SED 's/[a-zA-Z]//g' | cut -d '.' -f -2).00"
 ucx_configured:
   - "${UCX_CONFIGURED}"
+enable_nightly_package:
+  - "${NIGHTLY_RELEASE_ENABLED}"
 EOF
 if [ "$UCX_ENABLED" = "ON" ]; then
     cat <<EOF >> $REPO_DIR/conda/conda-build/conda_build_config.yaml

diff --git a/continuous_integration/scripts/make-conda-env b/continuous_integration/scripts/make-conda-env
@@ -9,7 +9,6 @@ make_conda_env() {
         ci) get_yaml_and_make_conda_env;;
         release) make_release_env;;
         docs) get_yaml_and_make_conda_env;;
-        nightly-release) make_release_env;;
         *) return 1;;
     esac