Merge pull request #210 from datalad/rf-win

Revert "On Windows - use stack-lts-18.13.yaml"
datalad · Oct 18, 2024 · c11a3c6 · c11a3c6
2 parents 844a1bc + 4248976
commit c11a3c6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
@@ -97,11 +97,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Choose stack config and enable building with magic
+      - name: Enable building with magic
         run: |
-          # Need to use that LTS ATM on Windows
-          # ref: https://github.com/datalad/git-annex/issues/168#issuecomment-1665910564
-          cp stack-lts-18.13.yaml stack.yaml
           perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
 
       - name: Set UPGRADE_LOCATION

diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2
@@ -217,11 +217,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Choose stack config and enable building with magic
+      - name: Enable building with magic
         run: |
-          # Need to use that LTS ATM on Windows
-          # ref: https://github.com/datalad/git-annex/issues/168#issuecomment-1665910564
-          cp stack-lts-18.13.yaml stack.yaml
           perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
 
       - name: Set UPGRADE_LOCATION