Merge pull request #119 from anaconda-distribution/fix_gcc_activation

Skip ctng-compiler-activation-feedstock because it is superseeded by gcc_activation-toolchain
anaconda · Mar 28, 2024 · b6842f2 · b6842f2
2 parents 31644c3 + 0c7ed05
commit b6842f2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/.github/actions/setup-env/action.yaml b/.github/actions/setup-env/action.yaml
@@ -30,5 +30,5 @@ runs:
         source $CONDA/etc/profile.d/conda.sh
         conda init bash
         sed -i 's/- python >=3.*$/- python ${{ inputs.python-version }}.*/' environment.yaml
-        conda env create -f environment.yaml --name percy --force
+        conda env create -f environment.yaml --name percy
         conda run --name percy pip install .
diff --git a/percy/render/aggregate.py b/percy/render/aggregate.py
@@ -320,7 +320,31 @@ def load_local_feedstocks(
                 continue
             if feedstock_name.startswith("ctng-compilers-"):
                 logging.warning(
-                    "Skipping feedstock %s now replaced by binutils-feedstock and gcc_toolchain-toolchain",
+                    "Skipping feedstock %s now replaced by binutils-feedstock and gcc_toolchain-feedstock",
+                    feedstock_name,
+                )
+                continue
+            if feedstock_name.startswith("ctng-compiler-activation-"):
+                logging.warning(
+                    "Skipping feedstock %s now replaced by gcc_activation-feedstock",
+                    feedstock_name,
+                )
+                continue
+            if feedstock_name.startswith("llvm-compilers-"):
+                logging.warning(
+                    "Skipping feedstock %s now replaced by llvmdev-feedstock",
+                    feedstock_name,
+                )
+                continue
+            if feedstock_name.startswith("clang-compilers-"):
+                logging.warning(
+                    "Skipping feedstock %s now replaced by clangdev-feedstock",
+                    feedstock_name,
+                )
+                continue
+            if feedstock_name.startswith("clang-compiler-activation-"):
+                logging.warning(
+                    "Skipping feedstock %s now replaced by clangdev-feedstock",
                     feedstock_name,
                 )
                 continue