Merge branch 'main' into MichaelFu512-fix-conda-out-of-space

alteryx · Oct 13, 2023 · ad9e52f · ad9e52f
2 parents 1c029f0 + ebe869c
commit ad9e52f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/build_conda_pkg.yaml b/.github/workflows/build_conda_pkg.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - MichaelFu512-fix-conda-out-of-space
   pull_request:
     types: [ opened, synchronize ]
     paths:

diff --git a/docs/source/release_notes.rst b/docs/source/release_notes.rst
@@ -16,7 +16,7 @@ Release Notes
     * Enhancements
     * Fixes
          * Fixed bug related to pypi release github action failing :pr:`4330`
-         * Fixed bug related to conda build github action :pr:`4335` :pr:`4337`
+         * Fixed bug related to conda build github action :pr:`4335` :pr:`4337`, :pr:`4338`, :pr:`4340`
     * Changes
     * Documentation Changes
     * Testing Changes