Ver Fonte

fixing windows github builds (#1818)

Sean OMeara há 2 anos atrás
pai
commit
3e41163bbe
1 ficheiros alterados com 15 adições e 11 exclusões
  1. 15 11
      .github/workflows/build.yml

+ 15 - 11
.github/workflows/build.yml

@@ -25,7 +25,6 @@ jobs:
         toolchain: stable
         toolchain: stable
         target: aarch64-apple-darwin
         target: aarch64-apple-darwin
         override: true
         override: true
-        components: rustfmt, clippy
 
 
     - name: make
     - name: make
       run: make
       run: make
@@ -33,15 +32,20 @@ jobs:
     - name: selftest
     - name: selftest
       run: make selftest
       run: make selftest
 
 
-  # build_windows:
-  #   runs-on: windows-latest
-  #   steps:
-  #   - name: checkout
-  #     uses: actions/checkout@v3
+  build_windows:
+    runs-on: windows-latest
+    steps:
+    - name: gitconfig
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+
+    - name: checkout
+      uses: actions/checkout@v3
 
 
-  #   - name: setup msbuild
-  #     uses: microsoft/[email protected]
+    - name: setup msbuild
+      uses: microsoft/[email protected]
 
 
-  #   - name: msbuild
-  #     run: |
-  #       msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release  /property:Platform=x64 /t:ZeroTierOne:Rebuild
+    - name: msbuild
+      run: |
+        msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release  /property:Platform=x64 /t:ZeroTierOne:Rebuild