hmm

Author: ceholden

.github/workflows/build_push_pr_ecr.yml

@@ -6,7 +6,7 @@ on:
 
 env:
   CONDA_CHANNEL: "s3://hls-conda-channels/hls-atmospheric-correction/pr-${{ github.event.pull_request.number }}"
-  CHANNEL_DIR: "channel/"
+  CONDA_CHANNEL_HTTP: "https://hls-conda-channels.s3.amazonaws.com/hls-atmospheric-correction/pr-${{ github.event.pull_request.number }}"
   # FIXME: for now set "--frozen" since we're having trouble with inconsistent lockfiles
   PIXI_FROZEN: true
 
@@ -44,11 +44,10 @@ jobs:
   # ------------------------------------------------------------------
   build-and-publish:
     needs: analyze
+    if: needs.analyze.outputs.has_changes == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
 
       - uses: prefix-dev/setup-pixi@v0.9.2
         with:
@@ -65,40 +64,63 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-west-2
 
-      - name: Build and publish packages
-        if: needs.analyze.outputs.has_changes == 'true'
+      - name: Execute Build Sequence
         run: |
-          export CHANNEL_DIR
           pixi run -e build \
             build-publish-packages \
             "${{ needs.analyze.outputs.build_order }}"
 
+  # ------------------------------------------------------------------
+  # JOB 3: Docker Build & Lockfile Update
+  # ------------------------------------------------------------------
+  build-docker:
+    needs: [analyze, build-and-publish]
+    # Run if Docker changed OR if packages were rebuilt (and build job succeeded)
+    if: |
+      always() &&
+      (needs.analyze.outputs.docker_changed == 'true' || needs.analyze.outputs.has_changes == 'true') &&
+      (needs.build-and-publish.result == 'success' || needs.build-and-publish.result == 'skipped')
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+
+      - uses: prefix-dev/setup-pixi@v0.9.2
+        with:
+          frozen: true
+          environments: build
+
       - name: Update Lockfile
         if: needs.analyze.outputs.has_changes == 'true'
         run: |
           echo "Updating lockfile for: ${{ needs.analyze.outputs.build_order }}"
 
           # Add local package builds to "pr" feature as top priority
-          pixi workspace channel add --no-install --prepend ./${CHANNEL_DIR}
+          pixi workspace channel add --no-install --prepend ${CONDA_CHANNEL_HTTP}
 
           # Update for these new builds
           pixi update --no-install ${{ needs.analyze.outputs.build_order }}
 
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-west-2
+
       - name: Login to Amazon ECR
-        if: needs.analyze.outputs.docker_changed == 'true'
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Build and Push Docker Image
-        if: needs.analyze.outputs.docker_changed == 'true'
         env:
           ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
           ECR_REPOSITORY: hls-atmospheric-correction
           IMAGE_TAG: ${{ github.event.pull_request.number }}
         run: |
           docker build \
             -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG \
-            --build-arg CHANNEL_DIR=${CHANNEL_DIR} \
             .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
 

Dockerfile

@@ -1,7 +1,6 @@
 # syntax=docker/dockerfile:1.7-labs
 ARG PLATFORM=linux/amd64
 ARG ENVIRONMENT=default
-ARG CHANNEL_DIR=channel
 FROM --platform=${PLATFORM} ghcr.io/prefix-dev/pixi:bookworm-slim AS build
 
 WORKDIR /app
@@ -15,7 +14,7 @@ RUN apt-get update && \
 
 ENV PIXI_FROZEN=true
 
-COPY --parents pixi.toml pixi.lock ${CHANNEL_DIR} /app/
+COPY --parents pixi.toml pixi.lock /app/
 RUN --mount=type=cache,target=/root/.cache/rattler/cache,sharing=private \
     pixi install -e $ENVIRONMENT
 

scripts/ci/build-and-publish.sh

@@ -35,5 +35,6 @@ echo "☁️  Uploading to S3..."
 echo "------------------------------------------------"
 rattler-build upload s3 --force --channel ${CONDA_CHANNEL} ${CHANNEL_DIR}/**/*.conda
 rattler-index s3 ${CONDA_CHANNEL}
+rattler-index s3 --target-platform osx-arm64 ${CONDA_CHANNEL}
 
 echo "🎉 Done."