Merge remote-tracking branch 'vendor/master' into graphics

3 files changed, 25 insertions, 17 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 652e65aa..0a0b5f6f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,12 +14,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Stable
         run: cargo test
+      - name: Stable (no default features)
+        run: cargo test -p alacritty_terminal --no-default-features
       - name: Oldstable
         run: |
-          rustup default 1.60.0
+          rustup default 1.70.0
           cargo test
       - name: Clippy
         run: |
@@ -28,7 +30,7 @@ jobs:
   check-macos-arm:
     runs-on: macos-11
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install target
         run: rustup update && rustup target add aarch64-apple-darwin
       - name: Build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1d16087b..17b2d1af 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,7 +13,9 @@ jobs:
     runs-on: macos-11
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - name: Install dependencies
+        run: brew install scdoc
       - name: Install ARM target
         run: rustup update && rustup target add aarch64-apple-darwin
       - name: Test
@@ -35,7 +37,7 @@ jobs:
         shell: bash
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Test
         run: cargo test --release
       - name: Build
@@ -46,14 +48,12 @@ jobs:
           ./.github/workflows/upload_asset.sh \
             ./Alacritty-${GITHUB_REF##*/}-portable.exe $GITHUB_TOKEN
       - name: Install WiX
-        run: nuget install WiX
+        run: dotnet tool install --global wix --version 4.0.1
       - name: Crate msi installer
         run: |
-          ./WiX.*/tools/candle.exe -nologo -arch "x64" -ext WixUIExtension -ext WixUtilExtension \
-            -out "./alacritty.wixobj" "alacritty/windows/wix/alacritty.wxs"
-          ./WiX.*/tools/light.exe -nologo -ext WixUIExtension -ext WixUtilExtension \
-            -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" -sice:ICE61 -sice:ICE91 \
-            "./alacritty.wixobj"
+          wix extension add WixToolset.UI.wixext WixToolset.Util.wixext
+          wix build -arch "x64" -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext \
+          -out "./Alacritty-${GITHUB_REF##*/}-installer.msi" "alacritty/windows/wix/alacritty.wxs"
       - name: Upload msi installer
         run: |
           ./.github/workflows/upload_asset.sh \
@@ -63,26 +63,29 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install dependencies
         run: |
           sudo apt-get install cmake pkg-config libfreetype6-dev libfontconfig1-dev \
-            libxcb-xfixes0-dev libxkbcommon-dev python3
+            libxcb-xfixes0-dev libxkbcommon-dev python3 scdoc
       - name: Test
         run: cargo test --release
-      - name: Gzip manpage
+      - name: Generate manpages
         run: |
-          gzip -c "./extra/alacritty.man" > "./alacritty.1.gz"
-          gzip -c "./extra/alacritty-msg.man" > "./alacritty-msg.1.gz"
+          scdoc < extra/man/alacritty.1.scd | gzip -c > "./alacritty.1.gz"
+          scdoc < extra/man/alacritty-msg.1.scd | gzip -c > "./alacritty-msg.1.gz"
+          scdoc < extra/man/alacritty.5.scd | gzip -c > "./alacritty.5.gz"
+          scdoc < extra/man/alacritty-bindings.5.scd | gzip -c > "./alacritty-bindings.5.gz"
       - name: Upload Assets
         run: |
           mv ./extra/logo/alacritty-term.svg ./Alacritty.svg
           ./.github/workflows/upload_asset.sh ./Alacritty.svg $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./alacritty.1.gz $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./alacritty-msg.1.gz $GITHUB_TOKEN
+          ./.github/workflows/upload_asset.sh ./alacritty.5.gz $GITHUB_TOKEN
+          ./.github/workflows/upload_asset.sh ./alacritty-bindings.5.gz $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./extra/completions/alacritty.bash $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./extra/completions/alacritty.fish $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./extra/completions/_alacritty $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./extra/linux/Alacritty.desktop $GITHUB_TOKEN
           ./.github/workflows/upload_asset.sh ./extra/alacritty.info $GITHUB_TOKEN
-          ./.github/workflows/upload_asset.sh ./alacritty.yml $GITHUB_TOKEN
diff --git a/.github/workflows/upload_asset.sh b/.github/workflows/upload_asset.sh
index 55845ae9..9e1f40e5 100755
--- a/.github/workflows/upload_asset.sh
+++ b/.github/workflows/upload_asset.sh
@@ -30,6 +30,7 @@ echo "Git tag: $tag"
 echo "Checking for existing release..."
 upload_url=$(\
     curl \
+        --http1.1 \
         -H "Authorization: Bearer $bearer" \
         "https://api.github.com/repos/$repo/releases" \
         2> /dev/null \
@@ -48,6 +49,7 @@ if [ -z "$upload_url" ]; then
     # Create new release.
     response=$(
         curl -f \
+            --http1.1 \
             -X POST \
             -H "Authorization: Bearer $bearer" \
             -d "{\"tag_name\":\"$tag\",\"draft\":true}" \
@@ -79,6 +81,7 @@ fi
 file_name=${file_path##*/}
 echo "Uploading asset $file_name to $upload_url..."
 curl -f \
+    --http1.1 \
     -X POST \
     -H "Authorization: Bearer $bearer" \
     -H "Content-Type: application/octet-stream" \