Skip to content

Commit f2f6b59

Browse files
authored
Merge pull request #3 from shaneknapp/minor-doc-workflow-tweaks
fixing typo, minor workflow tweaks
2 parents 2c19b22 + 205f0ce commit f2f6b59

File tree

3 files changed

+10
-17
lines changed

3 files changed

+10
-17
lines changed

.github/workflows/build-push-image-commit.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ jobs:
1414
image-tag: ${{ steps.build-and-push.outputs.IMAGE_SHA_TAG }}
1515

1616
steps:
17-
- name: Cleanup disk space
18-
run: |
19-
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
20-
df -h
21-
2217
- name: Check out the image repo
2318
uses: actions/checkout@v4
2419
with:
@@ -35,6 +30,12 @@ jobs:
3530
.github/**
3631
images/**
3732
33+
- name: Cleanup disk space
34+
if: steps.changed-files.outputs.any_changed == 'true'
35+
run: |
36+
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
37+
df -h
38+
3839
- name: Log in to GAR
3940
if: steps.changed-files.outputs.any_changed == 'true'
4041
uses: docker/login-action@v3
@@ -81,7 +82,6 @@ jobs:
8182
repository: 'berkeley-dsep-infra/datahub'
8283
sparse-checkout: |
8384
deployments/
84-
hub/
8585
8686
- name: Set git identity
8787
if: ${{ env.IMAGE_TAG }}

.github/workflows/build-test-image.yaml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ jobs:
99
env:
1010
DOCKER_CONFIG: $HOME/.docker
1111
steps:
12-
- name: cleanup disk space
13-
run: |
14-
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
15-
df -h
16-
1712
- name: Checkout files in repo
1813
uses: actions/checkout@v4
1914

@@ -28,13 +23,11 @@ jobs:
2823
.github/**
2924
images/**
3025
31-
- name: What files changed?
26+
- name: Cleanup disk space
3227
if: steps.changed-files.outputs.any_changed == 'true'
33-
env:
34-
CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}
3528
run: |
36-
echo "One or more image file(s) has changed:"
37-
echo "$CHANGED_FILES"
29+
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
30+
df -h
3831
3932
- name: Build and test the image if any image file(s) changed
4033
if: steps.changed-files.outputs.any_changed == 'true'

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ what's been modified and check out the diffs: `git status` and `git diff`.
8181

8282
### Building the image locally
8383

84-
You should use [repo2-docker](https://repo2docker.readthedocs.io/en/latest/) to build and use/test the image on your own device before you push and create a PR. It's better (and typically faster) to do this first before using CI/CD. There's no need to waste Github Action minutes to test build images when you can do this on your own device!
84+
You should use [repo2docker](https://repo2docker.readthedocs.io/en/latest/) to build and use/test the image on your own device before you push and create a PR. It's better (and typically faster) to do this first before using CI/CD. There's no need to waste Github Action minutes to test build images when you can do this on your own device!
8585

8686
Run `repo2docker` from inside the cloned image repo. To run on a linux/WSL2 linux shell:
8787
```

0 commit comments

Comments
 (0)