Browse Source

Revert "commented out choco push, giving weird errors"

This reverts commit 1488916ec6074fd059ca46960567193a4fd8d89d.
Scott Brogden 1 month ago
parent
commit
684773dc23
1 changed files with 43 additions and 43 deletions
  1. 43 43
      .github/workflows/build.yml

+ 43 - 43
.github/workflows/build.yml

@@ -100,49 +100,49 @@ jobs:
             7z a DittoSetup\output\DittoDebug_${{env.VERSION_FILENAME}}.7z *.pdb -r
             7z a DittoSetup\output\DittoDebug_${{env.VERSION_FILENAME}}.7z *.map -r
             
-#      - name: Choco - Ditto
-#        run: |
-#            (Get-Content 'DittoSetup\Chocolatey\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey\ditto.nuspec'
-#            copy DittoSetup\Output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe
-#            cd DittoSetup\Chocolatey
-#            choco pack     
-#            choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
-#            cd ..
-#            cd ..
-#            
-#     - name: Choco - Ditto.Install
-#       run: |
-#           (Get-Content 'DittoSetup\Chocolatey.install\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.install\ditto.nuspec'
-#           copy DittoSetup\output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey.install\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe
-#           cd DittoSetup\Chocolatey.install
-#           choco pack     
-#           choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
-#           cd ..
-#           cd ..
-#   
-#     - name: Choco - Ditto.Portable
-#       run: |
-#           (Get-Content 'DittoSetup\Chocolatey.portable\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.portable\ditto.nuspec'
-#           copy DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip DittoSetup\Chocolatey.portable\tools\DittoPortable_${{env.VERSION_FILENAME}}.zip
-#           cd DittoSetup\Chocolatey.portable
-#           choco pack     
-#           choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
-#           cd ..
-#           cd ..
-#           
-#     - name: Build appx
-#       run: |
-#           7z x DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip -oDittoSetup\appx -r
-#           (Get-Content 'DittoSetup\appx\appxmanifest.xml' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\appx\appxmanifest.xml'  
-#           cd DittoSetup\appx
-#
-#           $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86"
-#       
-#           makeappx.exe pack /f files.ini /p Ditto_${{env.VERSION_FILENAME}}.appx
-#           signtool.exe sign -f my.pfx -fd SHA256 -v Ditto_${{env.VERSION_FILENAME}}.appx
-#           cd ..
-#           cd ..
-#           copy DittoSetup\appx\Ditto_${{env.VERSION_FILENAME}}.appx DittoSetup\Output\Ditto_${{env.VERSION_FILENAME}}.appx
+      - name: Choco - Ditto
+        run: |
+            (Get-Content 'DittoSetup\Chocolatey\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey\ditto.nuspec'
+            copy DittoSetup\Output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe
+            cd DittoSetup\Chocolatey
+            choco pack     
+            choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
+            cd ..
+            cd ..
+            
+      - name: Choco - Ditto.Install
+        run: |
+            (Get-Content 'DittoSetup\Chocolatey.install\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.install\ditto.nuspec'
+            copy DittoSetup\output\DittoSetup_${{env.VERSION_FILENAME}}.exe DittoSetup\Chocolatey.install\tools\DittoSetup_${{env.VERSION_FILENAME}}.exe
+            cd DittoSetup\Chocolatey.install
+            choco pack     
+            choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
+            cd ..
+            cd ..
+    
+      - name: Choco - Ditto.Portable
+        run: |
+            (Get-Content 'DittoSetup\Chocolatey.portable\ditto.nuspec' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\Chocolatey.portable\ditto.nuspec'
+            copy DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip DittoSetup\Chocolatey.portable\tools\DittoPortable_${{env.VERSION_FILENAME}}.zip
+            cd DittoSetup\Chocolatey.portable
+            choco pack     
+            choco push --source https://push.chocolatey.org/ --key ${{ secrets.CHOCO_API_KEY}}
+            cd ..
+            cd ..
+            
+      - name: Build appx
+        run: |
+            7z x DittoSetup\output\DittoPortable_${{env.VERSION_FILENAME}}.zip -oDittoSetup\appx -r
+            (Get-Content 'DittoSetup\appx\appxmanifest.xml' -Raw).Replace("%version%", "${{env.VERSION_DOT_FILENAME}}") | Out-File 'DittoSetup\appx\appxmanifest.xml'  
+            cd DittoSetup\appx
+
+            $env:Path += ";C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x86"
+        
+            makeappx.exe pack /f files.ini /p Ditto_${{env.VERSION_FILENAME}}.appx
+            signtool.exe sign -f my.pfx -fd SHA256 -v Ditto_${{env.VERSION_FILENAME}}.appx
+            cd ..
+            cd ..
+            copy DittoSetup\appx\Ditto_${{env.VERSION_FILENAME}}.appx DittoSetup\Output\Ditto_${{env.VERSION_FILENAME}}.appx
     
       - name: Publish to GitHub
         env: