Skip to content

Fixes Dev Weekly Release Builds #5959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acpaquette merged 2 commits into from
Feb 6, 2026
Merged

Fixes Dev Weekly Release Builds #5959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a813d1
fix dev builds
amystamile-usgs Feb 6, 2026
0969006
fix xalan missing
amystamile-usgs Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions .github/workflows/dev-biweekly-release.yml → .github/workflows/dev-weekly-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# See https://github.com/actions/runner-images?tab=readme-ov-file#available-images for Github's Available Images

name: Github Actions - Build Dev Biweekly Anaconda Release
name: Github Actions - Build Dev Weekly Anaconda Release

env:
ANACONDA_API_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
Expand Down Expand Up @@ -38,8 +38,8 @@ jobs:
sed -i "s/git_tag: {{ version }}/git_tag: 'dev'/" meta.yaml
conda build . -c usgs-astrogeology -c conda-forge --override-channels --user usgs-astrogeology --label dev

build-macos13-x64:
runs-on: macos-13
build-macos-15-intel:
runs-on: macos-15-intel
steps:
- uses: actions/checkout@v4
- name: Set up Mambaforge
Expand Down Expand Up @@ -116,9 +116,9 @@ jobs:
conda list isis
spiceinit -h

test-macos13-x64:
runs-on: macos-13
needs: build-macos13-x64
test-macos-15-intel:
runs-on: macos-15-intel
needs: build-macos-15-intel
steps:
- name: Set up Miniforge
uses: conda-incubator/setup-miniconda@v3
Expand Down Expand Up @@ -165,11 +165,13 @@ jobs:
docs:
name: Build and Upload ISIS Dev Docs
runs-on: ubuntu-latest
needs: [test-ubuntu, test-macos13-x64, test-macos15-arm64]
needs: [test-ubuntu, test-macos-15-intel, test-macos15-arm64]
if: |
needs.test-ubuntu.result == 'success' ||
needs.test-macos13-x64.result == 'success' ||
needs.test-macos15-arm64.result == 'success'
always() && (
needs.test-ubuntu.result == 'success' ||
needs.test-macos-15-intel.result == 'success' ||
needs.test-macos15-arm64.result == 'success'
)
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" # To enable conda builds
mkdir build
cd build
export ISISROOT=$PWD
cmake -GNinja -DJP2KFLAG=ON -Dpybindings=ON -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis
cmake -GNinja -DJP2KFLAG=ON -DbuildDocs=OFF -Dpybindings=ON -DKAKADU_INCLUDE_DIR=/isisData/kakadu -DbuildTests=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX ../isis
ninja install
5 changes: 2 additions & 3 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ requirements:
- {{ pin_compatible('ale', max_pin='x.x.x') }}
- {{ pin_compatible('armadillo', max_pin='x.x.x') }}
- {{ pin_compatible('aom', max_pin='x.x') }}
- {{ pin_compatible('boost', max_pin='x.x') }}
- {{ pin_compatible('boost-cpp', max_pin='x.x') }}
- {{ pin_compatible('libboost', max_pin='x.x') }}
- blas
- {{ pin_compatible('bullet', max_pin='x.x') }}
- bz2file
Expand Down Expand Up @@ -168,7 +167,7 @@ requirements:
- {{ pin_compatible('proj', min_pin='x.x', max_pin='x.x') }}
- {{ pin_compatible('protobuf', max_pin='x.x') }}
- qhull
- {{ pin_compatible('qt-main', max_pin='x.x') }}
- {{ pin_compatible('qt6-main', max_pin='x.x') }}
- {{ pin_compatible('qwt', max_pin='x.x') }}
- rclone
- {{ pin_compatible('spiceql', max_pin='x.x') }}
Expand Down
Loading