Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "GHA: Work around a $p:bug in DMD's d_do_test.d" #8835

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Revert "GHA: Work around a $p:bug in DMD's d_do_test.d" #8835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions .github/workflows/main.yml
View file
Open in desktop
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