Skip to content

Commit

Permalink
debug ci
Browse files Browse the repository at this point in the history
  • Loading branch information
eightysteele committed Jul 17, 2024
1 parent ea3d72f commit 8fdd5a7
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 24 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,21 +33,21 @@ jobs:
- name: Setup gcloud
uses: google-github-actions/setup-gcloud@v2

- name: Install system environment and project dependencies
env:
GITHUB_CI: "true"
run: ./install.sh

- name: Setup caching for test assets
uses: actions/cache@v4
with:
path: assets
key: ${{ runner.os }}-${{ matrix.runner }}-assets
restore-keys: ${{ runner.os }}-${{ matrix.runner }}-assets

- name: Run tests
uses: prefix-dev/[email protected]
with:
pixi-version: v0.25.0
cache: true
run: pixi run all-tests-ci
# - name: Install system environment and project dependencies
# env:
# GITHUB_CI: "true"
# run: ./install.sh

# - name: Setup caching for test assets
# uses: actions/cache@v4
# with:
# path: assets
# key: ${{ runner.os }}-${{ matrix.runner }}-assets
# restore-keys: ${{ runner.os }}-${{ matrix.runner }}-assets

# - name: Run tests
# uses: prefix-dev/[email protected]
# with:
# pixi-version: v0.25.0
# cache: true
# run: pixi run all-tests-ci
3 changes: 1 addition & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,7 @@ __wrap__() {
# install environment
echo "installing b3d project dependencies..."
echo " pixi install..."
pixi install

pixi install
# copy in libEGL.so
cp assets/system/libEGL.so .pixi/envs/default/x86_64-conda-linux-gnu/sysroot/usr/lib64/

Expand Down
2 changes: 1 addition & 1 deletion scripts/check-auth.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ gcloud-global-install() {
}

gcloud-authenticated() {
if [ "$GITHUB_CI" = "true" ]; then
if [ "${GITHUB_CI:-}" = "true" ]; then
return 0
elif gcloud auth application-default print-access-token >/dev/null; then
return 0
Expand Down
10 changes: 7 additions & 3 deletions scripts/env-activation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@ export TORCH_CUDA_ARCH_LIST="$capability"
export XLA_FLAGS=--xla_gpu_enable_command_buffer=
export XLA_PYTHON_CLIENT_PREALLOCATE=false
export XLA_PYTHON_CLIENT_ALLOCATOR=platform
export CPLUS_INCLUDE_PATH="$CONDA_PREFIX/targets/x86_64-linux/include"

if ! [ -e "$CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/lib64/libEGL.so" ]; then
cp assets/system/libEGL.so "$CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/lib64/"
if ! [ "${CONDA_PREFIX:-}" = "" ]; then
export CPLUS_INCLUDE_PATH="$CONDA_PREFIX/targets/x86_64-linux/include"
if [ -d "$CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/lib64" ]; then
if ! [ -e "$CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/lib64/libEGL.so" ]; then
cp assets/system/libEGL.so "$CONDA_PREFIX/x86_64-conda-linux-gnu/sysroot/usr/lib64/"
fi
fi
fi

0 comments on commit 8fdd5a7

Please sign in to comment.