Skip to content

Commit

Permalink
CI: reset existing repo to known state
Browse files Browse the repository at this point in the history
If at some point a PR accidentally deletes a git submodule without
deleting it from .gitmodules, subsequent PRs using the same runner will
fail because the checkout action will try to run `git submodule foreach
...` before updating the git repo to match the current PR and fail, we
can avoid the problem by always resetting to origin/master which
hopefully is always in a good state.

Ideally the checkout action would be more robust: actions/checkout#354
  • Loading branch information
smarter committed Mar 24, 2021
1 parent 4b32aeb commit 3142efb
Showing 1 changed file with 45 additions and 1 deletion.
46 changes: 45 additions & 1 deletion .github/workflows/ci.yaml
Expand Up @@ -52,6 +52,9 @@ jobs:
- name: Set JDK 16 as default
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH

- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -97,6 +100,9 @@ jobs:
- name: Set JDK 16 as default
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH

- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -132,6 +138,10 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true
shell: cmd

- name: Git Checkout
uses: actions/checkout@v2

Expand All @@ -157,6 +167,10 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true
shell: cmd

- name: Git Checkout
uses: actions/checkout@v2

Expand Down Expand Up @@ -190,6 +204,9 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -230,6 +247,9 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand All @@ -244,7 +264,7 @@ jobs:

- name: Test
run: |
git submodule sync
git submodule sync && cat .gitmodules
git submodule update --init --recursive --jobs 7
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
Expand All @@ -270,6 +290,9 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -310,6 +333,9 @@ jobs:
)"

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -358,6 +384,9 @@ jobs:
- name: Set JDK 8 as default
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH

- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -394,6 +423,9 @@ jobs:
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -428,6 +460,9 @@ jobs:
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -474,6 +509,9 @@ jobs:
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -556,6 +594,9 @@ jobs:
# Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down Expand Up @@ -601,6 +642,9 @@ jobs:
SONATYPE_USER: ${{ secrets.SONATYPE_USER }}

steps:
- name: Reset existing repo
run: git fetch https://github.com/lampepfl/dotty && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

Expand Down

0 comments on commit 3142efb

Please sign in to comment.