Merge branch 'main' into tkp/uhdm

conda-forge · Sep 4, 2023 · 499b41c · 499b41c
2 parents 3f5d769 + ae12e7f
commit 499b41c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/correct_directory.yml b/.github/workflows/correct_directory.yml
@@ -23,8 +23,8 @@ jobs:
               repo: context.repo.repo,
               body: 'Hi! Thanks for your contribution to conda-forge.' +
                     '\nUnfortunately, the recipe was added directly in the `recipes` folder without its own subfolder.\n' +
-                    'Please move the recipe file (`<your_package.yaml>`) into a folder with the name of the package you want to submit.\n\n' +
+                    'Please move the recipe file into a folder with the name of the package you want to submit.\n\n' +
                     'For example: if your recipe is currently under `recipes/<your_package>.yaml`, ' +
-                    'it should be moved to `recipes/<your_package>/<your_package>.yaml`.\n' +
+                    'it should be moved to `recipes/<your_package>/meta.yaml`.\n' +
                     'Thanks!'
             })
diff --git a/.github/workflows/scripts/create_feedstocks.py b/.github/workflows/scripts/create_feedstocks.py
@@ -353,7 +353,7 @@ def write_token(name, token):
                      '--without-webservice', '--feedstock_directory',
                      feedstock_dir] + owner_info)
                 subprocess.check_call(
-                    ['conda', 'smithy', 'rerender'], cwd=feedstock_dir)
+                    ['conda', 'smithy', 'rerender', '--no-check-uptodate'], cwd=feedstock_dir)
             except subprocess.CalledProcessError:
                 exit_code = 0
                 traceback.print_exception(*sys.exc_info())
@@ -397,7 +397,7 @@ def write_token(name, token):
                     cwd=feedstock_dir
                 )
                 subprocess.check_call(
-                    ['conda', 'smithy', 'rerender'], cwd=feedstock_dir)
+                    ['conda', 'smithy', 'rerender', '--no-check-uptodate'], cwd=feedstock_dir)
             except subprocess.CalledProcessError:
                 exit_code = 0
                 traceback.print_exception(*sys.exc_info())