diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml deleted file mode 100644 index cd8df5b..0000000 --- a/.github/workflows/conda-build.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Conda Package Build - -on: - push: - branches: [ main, dev ] - pull_request: - branches: [ main, dev ] - workflow_dispatch: - # 允许手动触发 - -jobs: - build-macos-arm64: - runs-on: macos-latest # 使用最新的macOS runner - - defaults: - run: - shell: bash -l {0} - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Setup Miniconda - uses: conda-incubator/setup-miniconda@v3 - with: - miniconda-version: "latest" - channels: conda-forge,robostack-staging,defaults - channel-priority: strict - activate-environment: build-env - auto-activate-base: false - auto-update-conda: false - show-channel-urls: true - - - name: Install boa - run: | - conda install -c conda-forge boa python=3.11.11 - - - name: Show conda info - run: | - conda info - conda list - which conda-build - which boa - - - name: Build conda package - run: | - boa build -m ./recipes/conda_build_config.yaml -m ./recipes/macos_sdk_config.yaml ./recipes/ros-humble-unilabos-msgs - - - name: List built packages - run: | - echo "Built packages in conda-bld:" - find $CONDA_PREFIX/conda-bld -name "*.tar.bz2" | head -20 - ls -la $CONDA_PREFIX/conda-bld/osx-arm64/ || echo "osx-arm64 directory not found" - - - name: Upload conda package artifacts - uses: actions/upload-artifact@v4 - with: - name: conda-package-osx-arm64 - path: ${{ env.CONDA_PREFIX }}/conda-bld/**/*.tar.bz2 - if-no-files-found: warn - retention-days: 30 diff --git a/.github/workflows/multi-platform-build.yml b/.github/workflows/multi-platform-build.yml index f9bc0cd..a2a7cd9 100644 --- a/.github/workflows/multi-platform-build.yml +++ b/.github/workflows/multi-platform-build.yml @@ -81,15 +81,14 @@ jobs: echo "Platform: ${{ matrix.platform }}" echo "OS: ${{ matrix.os }}" - - name: Build conda package (macOS ARM64) - if: steps.should_build.outputs.should_build == 'true' && matrix.platform == 'osx-arm64' + - name: Build conda package + if: steps.should_build.outputs.should_build == 'true' run: | - boa build -m ./recipes/conda_build_config.yaml -m ./recipes/macos_sdk_config.yaml ./recipes/ros-humble-unilabos-msgs - - - name: Build conda package (Other platforms) - if: steps.should_build.outputs.should_build == 'true' && matrix.platform != 'osx-arm64' - run: | - boa build -m ./recipes/conda_build_config.yaml ./recipes/ros-humble-unilabos-msgs + if [[ "${{ matrix.platform }}" == "osx-arm64" ]]; then + boa build -m ./recipes/conda_build_config.yaml -m ./recipes/macos_sdk_config.yaml ./recipes/ros-humble-unilabos-msgs + else + boa build -m ./recipes/conda_build_config.yaml ./recipes/ros-humble-unilabos-msgs + fi - name: List built packages if: steps.should_build.outputs.should_build == 'true'