Skip to content

Commit 6f17057

Browse files
committed
cleanups
1 parent 575ff4f commit 6f17057

File tree

4 files changed

+6
-88
lines changed

4 files changed

+6
-88
lines changed

.github/workflows/build-images-ssh.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
name: Build VM Images (SSH)
22

33
on:
4-
push:
5-
paths:
6-
- 'vm-images/**'
7-
- '.github/workflows/build-images-ssh.yml'
8-
branches:
9-
- main
10-
- 'aktech/**'
4+
workflow_dispatch:
115

126
concurrency:
137
group: build-vm-images
@@ -56,13 +50,13 @@ jobs:
5650
- name: Build ${{ matrix.image-type }} image on remote server
5751
id: build
5852
run: |
59-
ssh -t gpuserver "export COLUMNS=200 && cd /tmp/repo-${{ github.run_id }} && make build-${{ matrix.image-type }} BUILD_DIR=/tmp/vm-images-build-${{ github.run_id }} UV=/tmp/uv-${{ github.run_id }}/uv"
53+
ssh -t gpuserver "cd /tmp/repo-${{ github.run_id }} && make build-${{ matrix.image-type }} BUILD_DIR=/tmp/vm-images-build-${{ github.run_id }} UV=/tmp/uv-${{ github.run_id }}/uv"
6054
IMAGE_NAME=$(ssh gpuserver "cd /tmp/vm-images-build-${{ github.run_id }}-${{ matrix.image-type }} && ls -1 *.qcow2 2>/dev/null | head -1 | sed 's/.qcow2$//'")
6155
echo "image_name=$IMAGE_NAME" >> $GITHUB_OUTPUT
6256
6357
- name: Upload image to OpenStack from server
6458
id: upload
65-
if: success() && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/aktech/'))
59+
if: success() && github.ref == 'refs/heads/main'
6660
run: |
6761
IMAGE_TAGS="--tag name=${{ steps.build.outputs.image_name }} --tag environment=ci --tag project=conda-forge-gpu-ci --tag image-type=${{ matrix.image-type }} --tag build-job-url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} --tag commit-hash=${{ github.sha }} --tag branch=${{ github.ref_name }} --tag build-timestamp=$(date -u +%Y%m%d-%H%M%S)"
6862
ssh gpuserver "cd /tmp/repo-${{ github.run_id }} && make upload-${{ matrix.image-type }} BUILD_DIR=/tmp/vm-images-build-${{ github.run_id }} UV=/tmp/uv-${{ github.run_id }}/uv IMAGE_TAGS='$IMAGE_TAGS'"
@@ -86,7 +80,7 @@ jobs:
8680
elif [ "${{ steps.upload.outcome }}" == "failure" ]; then
8781
echo "☁️ **OpenStack Upload:** ❌ Failed" >> $GITHUB_STEP_SUMMARY
8882
elif [ "${{ steps.upload.outcome }}" == "skipped" ]; then
89-
echo "☁️ **OpenStack Upload:** ⏭️ Skipped (not main/aktech branch)" >> $GITHUB_STEP_SUMMARY
83+
echo "☁️ **OpenStack Upload:** ⏭️ Skipped (not main branch)" >> $GITHUB_STEP_SUMMARY
9084
fi
9185
else
9286
echo "❌ **Build Status:** Failed" >> $GITHUB_STEP_SUMMARY

.github/workflows/openstack.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

vm-images/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ make build-cpu UV=/path/to/uv
4343

4444
## Automated Builds
4545

46-
GitHub Actions automatically builds and uploads images on push to `main` or `aktech/*` branches. Check `.github/workflows/build-images-ssh.yml`.
46+
GitHub Actions workflow (`.github/workflows/build-images-ssh.yml`) can be triggered manually via workflow_dispatch.
4747

48-
The workflow SSHs into the GPU server to run both CPU and GPU builds. GPU images require actual GPU hardware - they'll fail without it.
48+
The workflow SSHs into the GPU server to run both CPU and GPU builds. Uploads to OpenStack only happen on `main` branch. GPU images require actual GPU hardware - they'll fail without it.
4949

5050
## Image Contents
5151

vm-images/build-image.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ if [[ -z "${IMAGE_YAML}" ]]; then
2222
fi
2323

2424
export TMP=$(pwd)
25-
export COLUMNS=${COLUMNS:-200}
26-
export TERM=${TERM:-xterm}
2725

2826
UV=${UV:-uv}
2927

0 commit comments

Comments
 (0)