Skip to content

Commit

Permalink
Revert "GHA: Work around a $p:bug in DMD's d_do_test.d"
Browse files Browse the repository at this point in the history
This reverts commit 4f6de84, as DMD
master has been fixed.
  • Loading branch information
kinke authored and ibuclaw committed Oct 30, 2023
1 parent aa3416c commit 9353013
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 50
# d_do_test.d's `$p:` is buggy and chokes on the default `/Users/runner/work/phobos/phobos` path...
- name: Move repo to parent dir (a workaround)
run: mv -f * ../
- name: Clone DMD
run: |
set -uexo pipefail
cd ..
ref='${{ github.ref }}'
if [[ "$ref" =~ ^refs/pull/ ]]; then
Expand All @@ -64,17 +60,17 @@ jobs:
git clone --branch "$REPO_BRANCH" --depth 1 https://github.com/dlang/dmd.git ../dmd
- name: Install prerequisites
run: cd ../../dmd && ${{ runner.os == 'macOS' && 'ci/cirrusci.sh' || 'sudo -E ci/cirrusci.sh' }}
run: cd ../dmd && ${{ runner.os == 'macOS' && 'ci/cirrusci.sh' || 'sudo -E ci/cirrusci.sh' }}
- name: Install host compiler
run: cd ../../dmd && ci/run.sh install_host_compiler
run: cd ../dmd && ci/run.sh install_host_compiler
- name: Build
run: cd ../../dmd && ci/run.sh build
run: cd ../dmd && ci/run.sh build
- name: Test dmd
run: cd ../../dmd && ci/run.sh test_dmd
run: cd ../dmd && ci/run.sh test_dmd
- name: Test druntime
run: cd ../../dmd && ci/run.sh test_druntime
run: cd ../dmd && ci/run.sh test_druntime
- name: Test phobos
run: cd ../../dmd && ci/run.sh test_phobos
run: cd ../dmd && ci/run.sh test_phobos

freebsd-vm:
strategy:
Expand Down Expand Up @@ -124,11 +120,6 @@ jobs:
sudo pkg install -y git
echo '::endgroup::'
echo '::group::Move repo to parent dir (a workaround)'
mv -f * ../
cd ..
echo '::endgroup::'
echo '::group::Clone DMD'
ref='${{ github.ref }}'
if [[ "$ref" =~ ^refs/pull/ ]]; then
Expand Down

0 comments on commit 9353013

Please sign in to comment.