diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ec738227d2..94d0d0b9c3b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,10 +40,13 @@ 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 - ln -s "$GITHUB_WORKSPACE" ../phobos + cd .. ref='${{ github.ref }}' if [[ "$ref" =~ ^refs/pull/ ]]; then @@ -61,17 +64,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: @@ -121,9 +124,12 @@ jobs: sudo pkg install -y git echo '::endgroup::' - echo '::group::Clone DMD' - ln -s "$PWD" ../phobos + 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 REPO_BRANCH="$GITHUB_BASE_REF"