summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Long <willcode4@gmail.com>2023-12-10 06:13:13 -0500
committerJeff Long <willcode4@gmail.com>2023-12-10 09:15:53 -0500
commit9ff1777815f1bd15387889e65ab18302c199b726 (patch)
tree80946af0381bb30d7132f6da053177fab68aec6b
parentqt-gui: QRfnocF15ColorMapper: Add missing <array> include. (diff)
downloadgnuradio-9ff1777815f1bd15387889e65ab18302c199b726.tar.xz
gnuradio-9ff1777815f1bd15387889e65ab18302c199b726.zip
conda: sync conda-build.yml with main branch
Signed-off-by: Jeff Long <willcode4@gmail.com>
-rw-r--r--.github/workflows/conda-build.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
index df0078356..9d514bfb6 100644
--- a/.github/workflows/conda-build.yml
+++ b/.github/workflows/conda-build.yml
@@ -70,7 +70,7 @@ jobs:
CONFIG: ${{ matrix.CONFIG }}
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
CI: github_actions
- UPLOAD_ON_BRANCH: master
+ UPLOAD_ON_BRANCH: main
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
shell: bash
run: |
@@ -105,7 +105,7 @@ jobs:
CONFIG: ${{ matrix.CONFIG }}
CI: github_actions
UPLOAD_PACKAGES: ${{ matrix.UPLOAD_PACKAGES }}
- UPLOAD_ON_BRANCH: master
+ UPLOAD_ON_BRANCH: main
BINSTAR_TOKEN: ${{ secrets.BINSTAR_TOKEN }}
if: matrix.os == 'windows'
- name: Prepare conda build artifacts