Skip to content

Commit

Permalink
Merge pull request #57 from jaytmiller/chilly-errata
Browse files Browse the repository at this point in the history
Fix dangling references to chilly builds which have been removed.
  • Loading branch information
jaytmiller authored Aug 9, 2024
2 parents 3055319 + 7fb6a50 commit 4ab94d8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-floating.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
DEPLOYMENT_NAME: [ jwebbinar, roman, tike ]
USE_FROZEN: [ 0 ]
CAL_VERSION: [ none ]
FREEZE_CHILL: [ 1 ]
FREEZE: [ 1 ]
OWNER: [ quay.io/jupyter ]

permissions:
Expand All @@ -34,7 +34,7 @@ jobs:
- name: Configure
shell: bash
run: |
scripts/image-configure ${{ matrix.DEPLOYMENT_NAME }} --use-frozen ${{ matrix.USE_FROZEN }} --freeze-chill ${{ matrix.FREEZE_CHILL }} --cal-version ${{ matrix.CAL_VERSION }} --owner ${{ MATRIX.owner }}
scripts/image-configure ${{ matrix.DEPLOYMENT_NAME }} --use-frozen ${{ matrix.USE_FROZEN }} --freeze ${{ matrix.FREEZE }} --cal-version ${{ matrix.CAL_VERSION }} --owner ${{ MATRIX.owner }}
- name: Early exit for unaffected builds
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-frozen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
DEPLOYMENT_NAME: [ tike, jwebbinar, roman ]
USE_FROZEN: [ frozen ]
FREEZE_CHILL: [ 1 ]
FREEZE: [ 1 ]
OWNER: [ quay.io/jupyter ]

steps:
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set Up Environment
shell: bash
run: |
scripts/image-configure ${{ matrix.DEPLOYMENT_NAME }} --use-frozen ${{ matrix.USE_FROZEN }} --freeze-chill ${{ matrix.FREEZE_CHILL }} --owner ${{ matrix.OWNER }}
scripts/image-configure ${{ matrix.DEPLOYMENT_NAME }} --use-frozen ${{ matrix.USE_FROZEN }} --freeze ${{ matrix.FREEZE }} --owner ${{ matrix.OWNER }}
df -h
- name: Image Build
Expand Down
2 changes: 1 addition & 1 deletion scripts/image-base
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ frozen_hash_spec="$env_frozen_dir/docker-stacks.hash"
if [[ "$USE_FROZEN" == "1" ]]; then
git checkout `cat $frozen_hash_spec`
else
if [[ "$FREEZE_CHILL" == "1" ]]; then
if [[ "$FREEZE" == "1" ]]; then
echo `git rev-parse HEAD` > $frozen_hash_spec
fi
fi
Expand Down

0 comments on commit 4ab94d8

Please sign in to comment.