diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0fca4d567740..270dc1c7286f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,14 +15,11 @@ jobs: container: akmetiuk/dotty:2020-02-12 steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -58,14 +55,11 @@ jobs: container: akmetiuk/dotty:2020-02-12 steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -101,14 +95,11 @@ jobs: container: akmetiuk/dotty:2020-02-12 steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -150,14 +141,11 @@ jobs: github.event_name == 'schedule' steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -196,14 +184,11 @@ jobs: github.event_name == 'schedule' steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -247,14 +232,11 @@ jobs: SONATYPE_USER: ${{ secrets.SONATYPE_USER }} steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 @@ -296,14 +278,11 @@ jobs: # Make sure you have the write permissions to the repo: https://github.com/lampepfl/dotty-website steps: + - name: Checkout cleanup script + uses: actions/checkout@v2 + - name: Cleanup - run: | - TARGETS="$(pwd) /__w/_temp /github/home" - for folder in $TARGETS; do - echo "Cleaning $folder" - cd $folder - rm -rf ..?* .[!.]* * - done + run: .github/workflows/cleanup.sh - name: Git Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/cleanup.sh b/.github/workflows/cleanup.sh new file mode 100755 index 000000000000..24211ff368a0 --- /dev/null +++ b/.github/workflows/cleanup.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash +TARGETS="$(pwd) /__w/_temp /github/home/" +for folder in $TARGETS; do + echo "Cleaning $folder" + cd $folder + for f in $(ls -a); do + if [ "$f" != "." ] && + [ "$f" != ".." ] && + [ "$f" != "_github_home" ] # __w/_temp/_github_home is mount as + # /github/home and is cleaned separately + then + rm -rf "$f" + fi + done +done diff --git a/community-build/community-projects/sourcecode b/community-build/community-projects/sourcecode index 609ef3f28d54..9a32aedfa23d 160000 --- a/community-build/community-projects/sourcecode +++ b/community-build/community-projects/sourcecode @@ -1 +1 @@ -Subproject commit 609ef3f28d5408336508193c30d9a11a1252321e +Subproject commit 9a32aedfa23d641c938bb936ed5f471a92d6bb11 diff --git a/community-build/community-projects/utest b/community-build/community-projects/utest index f273216caec3..be5846efdb5e 160000 --- a/community-build/community-projects/utest +++ b/community-build/community-projects/utest @@ -1 +1 @@ -Subproject commit f273216caec39f220065db855c1a846a8f81a9e2 +Subproject commit be5846efdb5e2a236d6baafe1bd4d7ce6c20fc11 diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala index 072978cd0715..68addfb1526b 100644 --- a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala +++ b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala @@ -377,8 +377,8 @@ class CommunityBuildTest: @Test def ScalaPB = projects.ScalaPB.run() @Test def minitest = projects.minitest.run() @Test def fastparse = projects.fastparse.run() - //@Test def utest = projects.utest.run() - //@Test def sourcecode = projects.sourcecode.run() + @Test def utest = projects.utest.run() + @Test def sourcecode = projects.sourcecode.run() //@Test def oslib = projects.oslib.run() //@Test def ujson = projects.ujson.run() // @Test def oslibWatch = projects.oslibWatch.run()