fixup! Debug windows

jacob-carlborg · Jun 20, 2023 · bf6e6ca · bf6e6ca
1 parent 8b24331
commit bf6e6ca
Showing 1 changed file with 38 additions and 47 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,61 +82,52 @@ jobs:
         #     llvm: '10.0.0'
 
     steps:
-      - run: cp /c/Program\ Files/Microsoft\ Visual\ Studio/2022/Enterprise/VC/Tools/MSVC/14.36.32532/lib/x64/msvcprt.lib .
+      - name: Clone Repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+          fetch-depth: 0
 
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+      - name: Install Compiler
+        uses: dlang-community/setup-dlang@v1
+        if: ${{ matrix.os != 'freebsd' }}
         with:
-          name: artifacts
-          retention-days: 1
-          path: ./msvcprt.lib
+          compiler: ${{ matrix.compiler }}
 
+      - name: Download LLVM
+        if: ${{ runner.os != 'Windows' }}
+        run: |
+          curl -f -L -o llvm.tar.xz --retry 3 'https://github.com/jacob-carlborg/clang-builder/releases/download/v${{ matrix.llvm }}%2B0.0.1/llvm-${{ matrix.llvm }}-${{ matrix.os.target_triple }}.tar.xz'
+          tar xf llvm.tar.xz
+
+      - name: Download LLVM
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          curl -f -L -o llvm.7z --retry 3 https://github.com/jacob-carlborg/clang-builder/releases/download/v15.0.7%2B0.0.2-rc1/llvm-15.0.7-x86_64-pc-windows-msvc.7z
+          # curl -f -L -o llvm.7z --retry 3 'https://github.com/jacob-carlborg/clang-builder/releases/download/v${{ matrix.llvm }}%2B0.0.1/llvm-${{ matrix.llvm }}-${{ matrix.os.target_triple }}.7z'
+          7z x llvm.7z
 
-      # - name: Clone Repository
-      #   uses: actions/checkout@v3
-      #   with:
-      #     persist-credentials: false
-      #     fetch-depth: 0
-      #
-      # - name: Install Compiler
-      #   uses: dlang-community/setup-dlang@v1
-      #   if: ${{ matrix.os != 'freebsd' }}
-      #   with:
-      #     compiler: ${{ matrix.compiler }}
-      #
-      # - name: Download LLVM
-      #   if: ${{ runner.os != 'Windows' }}
-      #   run: |
-      #     curl -f -L -o llvm.tar.xz --retry 3 'https://github.com/jacob-carlborg/clang-builder/releases/download/v${{ matrix.llvm }}%2B0.0.1/llvm-${{ matrix.llvm }}-${{ matrix.os.target_triple }}.tar.xz'
-      #     tar xf llvm.tar.xz
-      #
-      # - name: Download LLVM
-      #   if: ${{ runner.os == 'Windows' }}
-      #   run: |
-      #     curl -f -L -o llvm.7z --retry 3 'https://github.com/jacob-carlborg/clang-builder/releases/download/v${{ matrix.llvm }}%2B0.0.1/llvm-${{ matrix.llvm }}-${{ matrix.os.target_triple }}.7z'
-      #     7z x llvm.7z
-      #
-      # # - name: Setup tmate session
-      # #   uses: mxschmitt/action-tmate@v3
-      # #   with:
-      # #     limit-access-to-actor: true
-      #
-      # - name: Configure LLVM
-      #   run: ./configure --llvm-path llvm-${{ matrix.llvm }} --statically-link-clang
-      #
-      # - name: Build
-      #   run: dub build
-      #
       # - name: Setup tmate session
       #   uses: mxschmitt/action-tmate@v3
       #   with:
       #     limit-access-to-actor: true
-      #
-      # - name: Test
-      #   if: ${{ matrix.os != 'freebsd' }}
-      #   run: |
-      #     ./bin/dstep --clang-version
-      #     dub test --verror
+
+      - name: Configure LLVM
+        run: ./configure --llvm-path llvm-${{ matrix.llvm }} --statically-link-clang
+
+      - name: Build
+        run: dub build
+
+      - name: Setup tmate session
+        uses: mxschmitt/action-tmate@v3
+        with:
+          limit-access-to-actor: true
+
+      - name: Test
+        if: ${{ matrix.os != 'freebsd' }}
+        run: |
+          ./bin/dstep --clang-version
+          dub test --verror
 
       # - name: Test FreeBSD
       #   if: ${{ matrix.os == 'freebsd' }}