Skip to content

Commit

Permalink
Merge pull request #80 from shaneknapp/minor-doc-workflow-tweaks
Browse files Browse the repository at this point in the history
fixing typo, minor workflow tweaks
  • Loading branch information
shaneknapp authored Oct 3, 2024
2 parents 650cf00 + 97c3155 commit 7697418
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-push-image-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ jobs:
image-tag: ${{ steps.build-and-push.outputs.IMAGE_SHA_TAG }}

steps:
- name: Cleanup disk space
run: |
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
df -h
- name: Check out the image repo
uses: actions/checkout@v4
with:
Expand All @@ -35,6 +30,12 @@ jobs:
.github/**
images/**
- name: Cleanup disk space
if: steps.changed-files.outputs.any_changed == 'true'
run: |
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
df -h
- name: Log in to GAR
if: steps.changed-files.outputs.any_changed == 'true'
uses: docker/login-action@v3
Expand Down Expand Up @@ -81,7 +82,6 @@ jobs:
repository: 'berkeley-dsep-infra/datahub'
sparse-checkout: |
deployments/
hub/
- name: Set git identity
if: ${{ env.IMAGE_TAG }}
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/build-test-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ jobs:
env:
DOCKER_CONFIG: $HOME/.docker
steps:
- name: cleanup disk space
run: |
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
df -h
- name: Checkout files in repo
uses: actions/checkout@v4

Expand All @@ -28,13 +23,11 @@ jobs:
.github/**
images/**
- name: What files changed?
- name: Cleanup disk space
if: steps.changed-files.outputs.any_changed == 'true'
env:
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
run: |
echo "One or more image file(s) has changed:"
echo "$CHANGED_FILES"
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
df -h
- name: Build and test the image if any image file(s) changed
if: steps.changed-files.outputs.any_changed == 'true'
Expand Down

0 comments on commit 7697418

Please sign in to comment.