Auto merge of servo#29984 - mukilan:fix-nightly-package-names, r=mrobinson

Fix package name for windows nightly

Also remove the 2020 specific packages.

The incorrect package name in windows.yml is causing nightly builds to fail.

---
- [ ] `./mach build -d` does not report any errors
- [ ] `./mach test-tidy` does not report any errors
- [ ] These changes fix #___ (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___

Author: bors-servo

.github/workflows/windows.yml

@@ -85,7 +85,7 @@ jobs:
       - name: Upload
         if: ${{ inputs.upload }}
         run: |
-          python mach upload-nightly win --secret-from-environment `
+          python mach upload-nightly windows-msvc --secret-from-environment `
             --github-release-id ${{ inputs.github-release-id }}
         env:
           S3_UPLOAD_CREDENTIALS: ${{ secrets.S3_UPLOAD_CREDENTIALS }}

python/servo/package_commands.py

@@ -53,15 +53,9 @@
     'linux': [
         'release/servo-tech-demo.tar.gz',
     ],
-    'linux-layout2020': [
-        'release/servo-tech-demo.tar.gz',
-    ],
     'mac': [
         'release/servo-tech-demo.dmg',
     ],
-    'mac-layout2020': [
-        'release/servo-tech-demo.dmg',
-    ],
     'macbrew': [
         'release/brew/servo.tar.gz',
     ],
@@ -73,10 +67,6 @@
         r'release\msi\Servo.exe',
         r'release\msi\Servo.zip',
     ],
-    'windows-msvc-layout2020': [
-        r'release\msi\Servo.exe',
-        r'release\msi\Servo.zip',
-    ],
 }