servo: Merge
#16468 - Remove windows-gnu build code (from aneeshusa:remove-windows-gnu); r=metajack
<!-- Please describe your changes on the following line: -->
This is a follow-up to servo/saltfs
#620.
There are three other places `windows-gnu` is mentioned, I'm not sure if they can also be removed or not:
- `nightly-x86_64-pc-windows-gnu` is listed as a target in the `appveyor.yml` build matrix
- 2 uses inside `host_platform` in `python/servo/util.py`
- The `windows_gnu` bootstrapper in `python/servo/bootstrap.py`
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they remove unused code
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Source-Repo:
https://github.com/servo/servo
Source-Revision:
7ae9c96467b1a80f104aa5346c9fd11522490541
--- a/servo/etc/ci/buildbot_steps.yml
+++ b/servo/etc/ci/buildbot_steps.yml
@@ -95,27 +95,17 @@ arm32:
- bash ./etc/ci/lockfile_changed.sh
- bash ./etc/ci/manifest_changed.sh
arm64:
- env SERVO_RUSTC_LLVM_ASSERTIONS=1 ./mach build --rel --target=aarch64-unknown-linux-gnu
- bash ./etc/ci/lockfile_changed.sh
- bash ./etc/ci/manifest_changed.sh
-windows-gnu-dev:
- - ./mach build --dev
- - ./mach test-unit
- - ./mach build-geckolib
-
windows-msvc-dev:
- mach.bat build --dev
- mach.bat test-unit
- mach.bat build-geckolib
-windows-gnu-nightly:
- - ./mach build --release
- - ./mach package --release
- - ./etc/ci/upload_nightly.sh windows-gnu
-
windows-msvc-nightly:
- mach.bat build --release
- mach.bat package --release
- bash -l ./etc/ci/upload_nightly.sh windows-msvc
--- a/servo/etc/ci/upload_nightly.sh
+++ b/servo/etc/ci/upload_nightly.sh
@@ -7,17 +7,17 @@
set -o errexit
set -o nounset
set -o pipefail
shopt -s failglob
usage() {
printf \
- "usage: %s android|linux|mac|macbrew|windows-gnu|windows-msvc\n" \
+ "usage: %s android|linux|mac|macbrew|windows-msvc\n" \
"${0}"
}
upload() {
local nightly_filename
nightly_filename="${4}-$(basename "${2}")"
local -r nightly_upload_dir="s3://servo-builds/nightly/${1}"
@@ -84,18 +84,17 @@ main() {
extension=tar.gz
package=target/release/*."${extension}"
elif [[ "${platform}" == "mac" ]]; then
extension=dmg
package=target/release/*."${extension}"
elif [[ "${platform}" == "macbrew" ]]; then
extension=tar.gz
package=target/release/brew/*."${extension}"
- elif [[ "${platform}" == "windows-gnu" ||
- "${platform}" == "windows-msvc" ]]; then
+ elif [[ "${platform}" == "windows-msvc" ]]; then
extension=msi
package=target/release/msi/*.msi
else
usage >&2
return 1
fi
# Lack of quotes on package allows glob expansion