Merge branch 'ershi/simplify-cu11-ci' into 'main'

Remove macos jobs from cu11 pipeline

See merge request omniverse/warp!608

.gitlab-ci.yml

@@ -166,6 +166,7 @@ ruff format:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
+        - .gitlab/ci/*
         - warp/**/*
         - pyproject.toml
         - tools/**/*
@@ -269,6 +270,7 @@ linux-x86_64 test minimal:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
+        - .gitlab/ci/*
         - warp/**/*
         - pyproject.toml
         - tools/**/*
@@ -340,6 +342,7 @@ linux-x86_64 test warp-init:
     - if: $CI_PIPELINE_SOURCE == "web"
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
       changes:
+        - .gitlab/ci/*
         - warp/**/*
         - pyproject.toml
         - tools/**/*
@@ -624,6 +627,7 @@ publish wheels to gitlab package registry:
   extends:
     - .runner-utility-linux-x86_64
   rules:
+    - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH =~ /^release-.*/
     - when: manual # If not auto-triggered, allow any pipeline to run this job manually
       allow_failure: true

.gitlab/ci/cuda-11-build-and-test.yml

@@ -75,15 +75,6 @@ windows-x86_64 build:
   script:
     - ./tools/ci/building/build-windows-x86_64/build.bat --cuda 11
 
-mac-x86_64 build:
-  stage: build
-  extends:
-    - .save_warp_bin_artifact
-    - .runner-build-macos-universal
-    - .macos_warp_tags
-  script:
-    - ./tools/ci/building/build-linux-x86_64/build.sh
-
 # ==============================================================================
 # Unit Testing Jobs
 #
@@ -159,21 +150,6 @@ windows-x86_64 test:
     - os/windows
     - gpu/2x-A5000
 
-mac-x86_64 test:
-  stage: test
-  needs: [mac-x86_64 build]
-  extends:
-    - .runner-test-macos-universal
-    - .macos_warp_tags
-    - .save_test_report_artifact
-  before_script:
-    - echo -e "\\e[0Ksection_start:`date +%s`:install_dependencies[collapsed=true]\\r\\e[0KInstalling dependencies"
-    - !reference [.snippets, install-python+warp-macos]
-    - python -m pip install --upgrade usd-core
-    - echo -e "\\e[0Ksection_end:`date +%s`:install_dependencies\\r\\e[0K"
-  script:
-    - python -m warp.tests --junit-report-xml rspec.xml -s autodetect
-
 # ==============================================================================
 # Packaging Jobs
 #
@@ -188,27 +164,20 @@ create pypi wheels:
     - linux-aarch64 build
     - linux-x86_64 build
     - windows-x86_64 build
-    - mac-x86_64 build
   extends:
     - .runner-utility-linux-x86_64
   before_script:
     # Move binaries into platform-specific folders. Already done in the build jobs for Linux.
     - mkdir -p warp/bin/windows-x86_64
     - mv warp/bin/warp.dll warp/bin/windows-x86_64/
     - mv warp/bin/warp-clang.dll warp/bin/windows-x86_64/
-    - mkdir -p warp/bin/macos-universal
-    - mv warp/bin/libwarp.dylib warp/bin/macos-universal/
-    - mv warp/bin/libwarp-clang.dylib warp/bin/macos-universal/
     - python3 -m pip install --upgrade pip
     - python3 -m pip install build
   script:
     - sed -i "s/^\(.*\)$/\1+cu11/" VERSION.md  # Modify VERSION.md with +cu11
     - python3 -m build --wheel -C--build-option=-Pwindows-x86_64
     - python3 -m build --wheel -C--build-option=-Plinux-x86_64
     - python3 -m build --wheel -C--build-option=-Plinux-aarch64
-    - sed -i "s/^\(.*\)+cu11$/\1+cpu/" VERSION.md  # Modify VERSION.md with +cu12 replaced by +cpu
-    - python3 -m build --wheel -C--build-option=-Pmacos-universal
-    - sed -i "s/^\(.*\)+cpu$/\1/" VERSION.md  # Revert VERSION.md changes
     - find . -type f -exec chmod 664 {} +
     - find . -type d -exec chmod 775 {} +
   artifacts:
@@ -277,6 +246,7 @@ publish wheels to gitlab package registry:
   extends:
     - .runner-utility-linux-x86_64
   rules:
+    - if: $PARENT_COMMIT_TAG
     - if: $PARENT_COMMIT_BRANCH =~ /release-.*/
     - when: manual # Can be triggered in all other scenarios
       allow_failure: true